diff options
author | Alfredo Deza <alfredo.deza@inktank.com> | 2013-08-16 14:05:28 -0400 |
---|---|---|
committer | Alfredo Deza <alfredo.deza@inktank.com> | 2013-08-16 14:05:28 -0400 |
commit | 396d0d012cfba9fab4906f316f4e15be0eb35ef9 (patch) | |
tree | 863df07fa34d0e6ab6c9299e4292a1f67fcc6246 | |
parent | 57bb8c31b903cf0c49471d3ecc652d73bc7010a6 (diff) | |
download | ceph-396d0d012cfba9fab4906f316f4e15be0eb35ef9.tar.gz |
make a ceph-rest module
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
-rw-r--r-- | src/pybind/ceph-rest/MANIFEST.in | 2 | ||||
-rw-r--r-- | src/pybind/ceph-rest/README.rst | 0 | ||||
-rwxr-xr-x | src/pybind/ceph-rest/ceph_rest/__init__.py (renamed from src/pybind/ceph-rest/ceph_rest.py) | 4 | ||||
-rw-r--r-- | src/pybind/ceph-rest/ceph_rest/argparse.py (renamed from src/pybind/ceph-rest/argparse.py) | 0 | ||||
-rw-r--r-- | src/pybind/ceph-rest/setup.py | 33 | ||||
-rw-r--r-- | src/pybind/ceph-rest/tox.ini | 6 |
6 files changed, 43 insertions, 2 deletions
diff --git a/src/pybind/ceph-rest/MANIFEST.in b/src/pybind/ceph-rest/MANIFEST.in new file mode 100644 index 00000000000..3c01b12a5a5 --- /dev/null +++ b/src/pybind/ceph-rest/MANIFEST.in @@ -0,0 +1,2 @@ +include setup.py +include README.rst diff --git a/src/pybind/ceph-rest/README.rst b/src/pybind/ceph-rest/README.rst new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/src/pybind/ceph-rest/README.rst diff --git a/src/pybind/ceph-rest/ceph_rest.py b/src/pybind/ceph-rest/ceph_rest/__init__.py index 421cc59edcc..0ff15ceaceb 100755 --- a/src/pybind/ceph-rest/ceph_rest.py +++ b/src/pybind/ceph-rest/ceph_rest/__init__.py @@ -11,7 +11,7 @@ import xml.etree.ElementTree import xml.sax.saxutils import flask -from ceph_argparse import \ +from ceph_rest.argparse import \ ArgumentError, CephPgid, CephOsdName, CephChoices, CephPrefix, \ concise_sig, descsort, parse_funcsig, parse_json_funcsigs, \ validate, json_command @@ -349,7 +349,7 @@ def handler(catchall_path=None, fmt=None, target=None): Main endpoint handler; generic for every endpoint, including catchall. Handles the catchall, anything with <.fmt>, anything with embedded <target>. Partial match or ?help cause the HTML-table - "show_human_help" output. + "show_human_help" output. ''' ep = catchall_path or flask.request.endpoint diff --git a/src/pybind/ceph-rest/argparse.py b/src/pybind/ceph-rest/ceph_rest/argparse.py index 427a4621216..427a4621216 100644 --- a/src/pybind/ceph-rest/argparse.py +++ b/src/pybind/ceph-rest/ceph_rest/argparse.py diff --git a/src/pybind/ceph-rest/setup.py b/src/pybind/ceph-rest/setup.py new file mode 100644 index 00000000000..8d0e6776ea6 --- /dev/null +++ b/src/pybind/ceph-rest/setup.py @@ -0,0 +1,33 @@ +from setuptools import setup, find_packages +import os + + +def long_description(): + readme = os.path.join(os.path.dirname(__file__), 'README.rst') + return open(readme).read() + + +setup( + name = 'ceph-rest', + description = 'Rest API for ceph', + packages=find_packages(), + author = 'Inktank', + author_email = 'ceph-devel@vger.kernel.org', + version = '0.67', + license = "LGPL2", + zip_safe = False, + keywords = "ceph, rest, bindings, api, cli", + install_requires = ['flask==0.10', 'rados'], + long_description = long_description(), + classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)', + 'Topic :: Software Development :: Libraries', + 'Topic :: Utilities', + 'Topic :: System :: Filesystems', + 'Operating System :: POSIX', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + ], +) diff --git a/src/pybind/ceph-rest/tox.ini b/src/pybind/ceph-rest/tox.ini new file mode 100644 index 00000000000..9c63bb9d884 --- /dev/null +++ b/src/pybind/ceph-rest/tox.ini @@ -0,0 +1,6 @@ +[tox] +envlist = py26, py27 + +[testenv] +deps= +commands= |