diff options
| -rw-r--r-- | MANIFEST.in | 9 | ||||
| -rw-r--r-- | heatclient/versioninfo | 2 | ||||
| -rw-r--r-- | setup.py | 42 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
4 files changed, 32 insertions, 23 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 03db8ab..0d8b125 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,10 @@ include AUTHORS +include HACKING +include LICENSE +include README.rst include ChangeLog +include tox.ini include heatclient/versioninfo -exclude .gitignore -exclude .gitreview +recursive-include doc * +recursive-include tests * +recursive-include tools * diff --git a/heatclient/versioninfo b/heatclient/versioninfo index 72d48f3..220fc7f 100644 --- a/heatclient/versioninfo +++ b/heatclient/versioninfo @@ -1 +1 @@ -0.0.9.4ba8e46 +0.0.11.3c9c859 @@ -1,33 +1,38 @@ -import os -import sys +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +import os import setuptools from heatclient.openstack.common import setup -requires = setup.parse_requirements() -dependency_links = setup.parse_dependency_links() -tests_require = setup.parse_requirements(['tools/test-requires']) - -if sys.version_info < (2, 6): - requires.append('simplejson') - - def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() setuptools.setup( name="python-heatclient", version=setup.get_post_version('heatclient'), + author='Heat API Developers', + author_email='discuss@heat-api.org', description="Client library for Heat orchestration API", long_description=read('README.md'), - url='https://github.com/heat-api/python-heatclient', license='Apache', - author='Heat API Developers', - author_email='discuss@heat-api.org', + url='https://github.com/heat-api/python-heatclient', packages=setuptools.find_packages(exclude=['tests', 'tests.*']), include_package_data=True, + install_requires=setup.parse_requirements(), + test_suite="nose.collector", + cmdclass=setup.get_cmdclass(), classifiers=[ 'Development Status :: 4 - Beta', 'Environment :: Console', @@ -37,11 +42,10 @@ setuptools.setup( 'Operating System :: OS Independent', 'Programming Language :: Python', ], - cmdclass=setup.get_cmdclass(), - install_requires=requires, - dependency_links=dependency_links, - tests_require=tests_require, + entry_points={ + 'console_scripts': ['heat = heatclient.shell:main'] + }, + dependency_links=setup.parse_dependency_links(), + tests_require=setup.parse_requirements(['tools/test-requires']), setup_requires=['setuptools-git>=0.4'], - test_suite="nose.collector", - entry_points={'console_scripts': ['heat = heatclient.shell:main']}, ) diff --git a/tools/pip-requires b/tools/pip-requires index bbb4edf..a24c146 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,4 +1,4 @@ argparse prettytable>=0.6,<0.7 -python-keystoneclient>=0.1.2,<0.2 +python-keystoneclient>=0.1.2 warlock<2 |