summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2013-01-08 17:35:58 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-01-08 18:11:37 +0900
commite69a8917ec203edb450caf86dbe06ca7c83ca77b (patch)
tree056f5e94ca19b0f34696d1f9e3a521a0090465a2
parent429401a1b87bf170b56f741a319390b327b291f1 (diff)
setup: update installation infos
- clean up setup.py and MANIFEST.in - simplejson isn't needed anymore - allow webob >= 1.0.8 as openstack quantum uses >= 1.0.8 version - allow gflags >= 1.3 as Fedora 18 uses gflags 1.5 Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--MANIFEST.in2
-rw-r--r--setup.cfg12
-rw-r--r--setup.py2
-rw-r--r--tools/pip-requires5
4 files changed, 14 insertions, 7 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index d7d8ecd8..1d97c885 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
include LICENSE
-include README.rst
include MANIFEST.in
+include *.rst
graft contrib
graft doc
graft etc
diff --git a/setup.cfg b/setup.cfg
index 411aadee..ac6ba193 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,14 @@
-# TODO
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
[bdist_rpm]
Release = 1
Group = Applications/Accessories
-Requires = python-gevent >= 0.13, python-gflags, python-simplejson, python-webob, python-routes
+Requires = python-gevent >= 0.13, python-gflags, python-routes, python-webob
+doc_files = LICENSE
+ MANIFEST.in
+ README.rst
+ SubmittingPatches.rst
+ doc/
diff --git a/setup.py b/setup.py
index f1915a7a..297c89d1 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
import sys
from setuptools import find_packages
@@ -35,6 +34,7 @@ if doing_bdist:
start:long_description.find('\n\n\n', start)]
classifiers = [
+ 'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: Apache Software License',
'Topic :: System :: Networking',
'Natural Language :: English',
diff --git a/tools/pip-requires b/tools/pip-requires
index c036d18e..592617ee 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,5 +1,4 @@
gevent>=0.13
-python-gflags==1.3
+python-gflags>=1.3
routes
-simplejson
-webob==1.0.8
+webob>=1.0.8