diff options
| -rw-r--r-- | .mailmap | 4 | ||||
| -rw-r--r-- | AUTHORS | 18 | ||||
| -rw-r--r-- | MANIFEST.in | 3 | ||||
| -rw-r--r-- | setup.cfg | 13 | ||||
| -rw-r--r-- | setup.py | 74 | ||||
| -rw-r--r-- | tools/nova.bash_completion | 18 | ||||
| -rw-r--r-- | tox.ini | 7 |
7 files changed, 84 insertions, 53 deletions
@@ -9,3 +9,7 @@ Johannes Erdfelt <johannes.erdfelt@rackspace.com> jerdfelt <johannes@erdfelt.com <sandy@darksecretsoftware.com> <sandy.walsh@rackspace.com> <sandy@darksecretsoftware.com> <sandy@sandywalsh.com> Andy Smith <github@anarkystic.com> termie <github@anarkystic.com> +<chmouel.boudjnah@rackspace.co.uk> <chmouel@chmouel.com> +<matt.dietz@rackspace.com> <matthew.dietz@gmail.com> +Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <nsokolov@griddynamics.com> +Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <chemikadze@gmail.com> @@ -1,17 +1,35 @@ Andrey Brindeyev <abrindeyev@griddynamics.com> Andy Smith <github@anarkystic.com> +Anthony Young <sleepsonthefloor@gmail.com> Antony Messerli <amesserl@rackspace.com> Brian Lamar <brian.lamar@rackspace.com> Brian Waldon <brian.waldon@rackspace.com> +Chmouel Boudjnah <chmouel.boudjnah@rackspace.co.uk> Chris Behrens <cbehrens+github@codestud.com> Christopher MacGown <ignoti+github@gmail.com> +Dan Wendlandt <dan@nicira.com> +Dean Troyer <dtroyer@gmail.com> Ed Leafe <ed@leafe.com> Eldar Nugaev <eldr@ya.ru> +Gabriel Hurley <gabriel@strikeawe.com> +Gaurav Gupta <gaurav@denali-systems.com> Ilya Alekseyev <ilyaalekseyev@acm.org> +Jake Dahn <admin@jakedahn.com> +James E. Blair <james.blair@rackspace.com> +Jason Kölker <jason@koelker.net> +Jason Straw <jason.straw@rackspace.com> +Jesse Andrews <anotherjesse@gmail.com> Johannes Erdfelt <johannes.erdfelt@rackspace.com> Josh Kearney <josh@jk0.org> Kevin L. Mitchell <kevin.mitchell@rackspace.com> Kirill Shileev <kshileev@griddynamics.com> Lvov Maxim <mlvov@mirantis.com> Matt Dietz <matt.dietz@rackspace.com> +Nicholas Mistry <nmistry@gmail.com> +Nikolay Sokolov <nsokolov@griddynamics.com> +Pavel Shkitin <pshkitin@griddynamics.com> +Rick Harris <rconradharris@gmail.com> +Robie Basak <robie.basak@canonical.com> Sandy Walsh <sandy@darksecretsoftware.com> +Unmesh Gurjar <unmesh.gurjar@vertex.co.in> +William Wolf <throughnothing@gmail.com> diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 2526eebe..00000000 --- a/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include README.rst -recursive-include docs * -recursive-include tests *
\ No newline at end of file diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index f7dc87f4..00000000 --- a/setup.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[nosetests] -cover-package = novaclient -cover-html = true -cover-erase = true -cover-inclusive = true - -[build_sphinx] -source-dir = docs/ -build-dir = docs/_build -all_files = 1 - -[upload_sphinx] -upload-dir = docs/_build/html @@ -1,40 +1,54 @@ +# Copyright 2011 OpenStack, LLC +# +# 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 import sys -from setuptools import setup, find_packages - -def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() -requirements = ['httplib2', 'argparse', 'prettytable'] +requirements = ["httplib2", "argparse", "prettytable"] if sys.version_info < (2, 6): - requirements.append('simplejson') + requirements.append("simplejson") -setup( - name = "python-novaclient", - version = "2.6.7", - description = "Client library for OpenStack Nova API", - long_description = read('README.rst'), - url = 'https://github.com/rackspace/python-novaclient', - license = 'Apache', - author = 'Rackspace, based on work by Jacob Kaplan-Moss', - author_email = 'github@racklabs.com', - packages = find_packages(exclude=['tests', 'tests.*']), - classifiers = [ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Console', - 'Intended Audience :: Developers', - 'Intended Audience :: Information Technology', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - ], - install_requires = requirements, - tests_require = ["nose", "mock"], - test_suite = "nose.collector", +def read_file(file_name): + return open(os.path.join(os.path.dirname(__file__), file_name)).read() - entry_points = { - 'console_scripts': ['nova = novaclient.shell:main'] + +setuptools.setup( + name="python-novaclient", + version="2.6.7", + author="Rackspace, based on work by Jacob Kaplan-Moss", + author_email="github@racklabs.com", + description="Client library for OpenStack Nova API.", + long_description=read_file("README.rst"), + license="Apache License, Version 2.0", + url="https://github.com/openstack/python-novaclient", + packages=["novaclient"], + install_requires=requirements, + tests_require=["nose", "mock"], + test_suite="nose.collector", + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Intended Audience :: Developers", + "Intended Audience :: Information Technology", + "License :: OSI Approved :: Apache Software License", + "Operating System :: OS Independent", + "Programming Language :: Python" + ], + entry_points={ + "console_scripts": ["nova = novaclient.shell:main"] } ) diff --git a/tools/nova.bash_completion b/tools/nova.bash_completion new file mode 100644 index 00000000..ab1579fc --- /dev/null +++ b/tools/nova.bash_completion @@ -0,0 +1,18 @@ +_nova() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="add-fixed-ip backup backup-schedule backup-schedule-delete boot + boot-for-account delete delete diagnostics flavor-list image-create + image-delete image-list ip-share ip-unshare ipgroup-create + ipgroup-delete ipgroup-list ipgroup-show list migrate pause reboot + rebuild remove-fixed-ip rename rescue resize resize-confirm + resize-revert resume root-password show suspend unpause unrescue + zone zone-add zone-boot zone-delete zone-info zone-list help + --debug --endpoint_name --password --projectid --region_name --url + --username --version" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) +} +complete -F _nova nova diff --git a/tox.ini b/tox.ini deleted file mode 100644 index bfbd689f..00000000 --- a/tox.ini +++ /dev/null @@ -1,7 +0,0 @@ -[tox] -envlist = py24,py25,py26,py27 - -[testenv] -deps = nose - mock -commands = nosetests
\ No newline at end of file |