Skip to content

Commit 149e00b

Browse files
committed
Adds bash completion support and cleans up setup.py.
Also removes some unnecessary files and updates the AUTHORS file. Change-Id: Iefa502ce08cbf34038d2e04d0460ae43468a4255
1 parent d14e421 commit 149e00b

7 files changed

Lines changed: 84 additions & 53 deletions

File tree

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ Johannes Erdfelt <johannes.erdfelt@rackspace.com> jerdfelt <johannes@erdfelt.com
99
<sandy@darksecretsoftware.com> <sandy.walsh@rackspace.com>
1010
<sandy@darksecretsoftware.com> <sandy@sandywalsh.com>
1111
Andy Smith <github@anarkystic.com> termie <github@anarkystic.com>
12+
<chmouel.boudjnah@rackspace.co.uk> <chmouel@chmouel.com>
13+
<matt.dietz@rackspace.com> <matthew.dietz@gmail.com>
14+
Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <nsokolov@griddynamics.com>
15+
Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <chemikadze@gmail.com>

AUTHORS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
11
Andrey Brindeyev <abrindeyev@griddynamics.com>
22
Andy Smith <github@anarkystic.com>
3+
Anthony Young <sleepsonthefloor@gmail.com>
34
Antony Messerli <amesserl@rackspace.com>
45
Brian Lamar <brian.lamar@rackspace.com>
56
Brian Waldon <brian.waldon@rackspace.com>
7+
Chmouel Boudjnah <chmouel.boudjnah@rackspace.co.uk>
68
Chris Behrens <cbehrens+github@codestud.com>
79
Christopher MacGown <ignoti+github@gmail.com>
10+
Dan Wendlandt <dan@nicira.com>
11+
Dean Troyer <dtroyer@gmail.com>
812
Ed Leafe <ed@leafe.com>
913
Eldar Nugaev <eldr@ya.ru>
14+
Gabriel Hurley <gabriel@strikeawe.com>
15+
Gaurav Gupta <gaurav@denali-systems.com>
1016
Ilya Alekseyev <ilyaalekseyev@acm.org>
17+
Jake Dahn <admin@jakedahn.com>
18+
James E. Blair <james.blair@rackspace.com>
19+
Jason Kölker <jason@koelker.net>
20+
Jason Straw <jason.straw@rackspace.com>
21+
Jesse Andrews <anotherjesse@gmail.com>
1122
Johannes Erdfelt <johannes.erdfelt@rackspace.com>
1223
Josh Kearney <josh@jk0.org>
1324
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
1425
Kirill Shileev <kshileev@griddynamics.com>
1526
Lvov Maxim <mlvov@mirantis.com>
1627
Matt Dietz <matt.dietz@rackspace.com>
28+
Nicholas Mistry <nmistry@gmail.com>
29+
Nikolay Sokolov <nsokolov@griddynamics.com>
30+
Pavel Shkitin <pshkitin@griddynamics.com>
31+
Rick Harris <rconradharris@gmail.com>
32+
Robie Basak <robie.basak@canonical.com>
1733
Sandy Walsh <sandy@darksecretsoftware.com>
34+
Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
35+
William Wolf <throughnothing@gmail.com>

MANIFEST.in

Lines changed: 0 additions & 3 deletions
This file was deleted.

setup.cfg

Lines changed: 0 additions & 13 deletions
This file was deleted.

setup.py

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,54 @@
1+
# Copyright 2011 OpenStack, LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
import os
16+
import setuptools
217
import sys
3-
from setuptools import setup, find_packages
4-
518

6-
def read(fname):
7-
return open(os.path.join(os.path.dirname(__file__), fname)).read()
819

9-
requirements = ['httplib2', 'argparse', 'prettytable']
20+
requirements = ["httplib2", "argparse", "prettytable"]
1021
if sys.version_info < (2, 6):
11-
requirements.append('simplejson')
22+
requirements.append("simplejson")
1223

13-
setup(
14-
name = "python-novaclient",
15-
version = "2.6.7",
16-
description = "Client library for OpenStack Nova API",
17-
long_description = read('README.rst'),
18-
url = 'https://github.com/rackspace/python-novaclient',
19-
license = 'Apache',
20-
author = 'Rackspace, based on work by Jacob Kaplan-Moss',
21-
author_email = 'github@racklabs.com',
22-
packages = find_packages(exclude=['tests', 'tests.*']),
23-
classifiers = [
24-
'Development Status :: 5 - Production/Stable',
25-
'Environment :: Console',
26-
'Intended Audience :: Developers',
27-
'Intended Audience :: Information Technology',
28-
'License :: OSI Approved :: Apache Software License',
29-
'Operating System :: OS Independent',
30-
'Programming Language :: Python',
31-
],
32-
install_requires = requirements,
3324

34-
tests_require = ["nose", "mock"],
35-
test_suite = "nose.collector",
25+
def read_file(file_name):
26+
return open(os.path.join(os.path.dirname(__file__), file_name)).read()
3627

37-
entry_points = {
38-
'console_scripts': ['nova = novaclient.shell:main']
28+
29+
setuptools.setup(
30+
name="python-novaclient",
31+
version="2.6.7",
32+
author="Rackspace, based on work by Jacob Kaplan-Moss",
33+
author_email="github@racklabs.com",
34+
description="Client library for OpenStack Nova API.",
35+
long_description=read_file("README.rst"),
36+
license="Apache License, Version 2.0",
37+
url="https://github.com/openstack/python-novaclient",
38+
packages=["novaclient"],
39+
install_requires=requirements,
40+
tests_require=["nose", "mock"],
41+
test_suite="nose.collector",
42+
classifiers=[
43+
"Development Status :: 5 - Production/Stable",
44+
"Environment :: Console",
45+
"Intended Audience :: Developers",
46+
"Intended Audience :: Information Technology",
47+
"License :: OSI Approved :: Apache Software License",
48+
"Operating System :: OS Independent",
49+
"Programming Language :: Python"
50+
],
51+
entry_points={
52+
"console_scripts": ["nova = novaclient.shell:main"]
3953
}
4054
)

tools/nova.bash_completion

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
_nova()
2+
{
3+
local cur prev opts
4+
COMPREPLY=()
5+
cur="${COMP_WORDS[COMP_CWORD]}"
6+
prev="${COMP_WORDS[COMP_CWORD-1]}"
7+
opts="add-fixed-ip backup backup-schedule backup-schedule-delete boot
8+
boot-for-account delete delete diagnostics flavor-list image-create
9+
image-delete image-list ip-share ip-unshare ipgroup-create
10+
ipgroup-delete ipgroup-list ipgroup-show list migrate pause reboot
11+
rebuild remove-fixed-ip rename rescue resize resize-confirm
12+
resize-revert resume root-password show suspend unpause unrescue
13+
zone zone-add zone-boot zone-delete zone-info zone-list help
14+
--debug --endpoint_name --password --projectid --region_name --url
15+
--username --version"
16+
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
17+
}
18+
complete -F _nova nova

tox.ini

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)