diff --git a/.mailmap b/.mailmap index 3966493a0..f270bb6f5 100644 --- a/.mailmap +++ b/.mailmap @@ -9,3 +9,7 @@ Johannes Erdfelt jerdfelt Andy Smith termie + + +Nikolay Sokolov Nokolay Sokolov +Nikolay Sokolov Nokolay Sokolov diff --git a/AUTHORS b/AUTHORS index 056b526ff..8d93b7a7c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,17 +1,35 @@ Andrey Brindeyev Andy Smith +Anthony Young Antony Messerli Brian Lamar Brian Waldon +Chmouel Boudjnah Chris Behrens Christopher MacGown +Dan Wendlandt +Dean Troyer Ed Leafe Eldar Nugaev +Gabriel Hurley +Gaurav Gupta Ilya Alekseyev +Jake Dahn +James E. Blair +Jason Kölker +Jason Straw +Jesse Andrews Johannes Erdfelt Josh Kearney Kevin L. Mitchell Kirill Shileev Lvov Maxim Matt Dietz +Nicholas Mistry +Nikolay Sokolov +Pavel Shkitin +Rick Harris +Robie Basak Sandy Walsh +Unmesh Gurjar +William Wolf diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 2526eebe1..000000000 --- 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 f7dc87f41..000000000 --- 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 diff --git a/setup.py b/setup.py index c69b236f2..09e150920 100644 --- a/setup.py +++ b/setup.py @@ -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', + +def read_file(file_name): + return open(os.path.join(os.path.dirname(__file__), file_name)).read() + + +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" ], - install_requires = requirements, - - tests_require = ["nose", "mock"], - test_suite = "nose.collector", - - entry_points = { - 'console_scripts': ['nova = novaclient.shell:main'] + 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 000000000..ab1579fc0 --- /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 bfbd689f5..000000000 --- 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