manual merge2.6.0

1 files changed, 14 insertions, 14 deletions

diff --git a/setup.py b/setup.py
index 6b74843a..9d2d579f 100644
--- a/setup.py
+++ b/setup.py
@@ -11,16 +11,16 @@ if sys.version_info < (2, 6):
     requirements.append('simplejson')
 
 setup(
-    name="python-novaclient",
-    version="2.5.9",
-    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']),
-    classifiers=[
+    name = "python-novaclient",
+    version = "2.6.0",
+    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']),
+    classifiers = [
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
         'Intended Audience :: Developers',
@@ -29,12 +29,12 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
     ],
-    install_requires=requirements,
+    install_requires = requirements,
 
-    tests_require=["nose", "mock"],
-    test_suite="nose.collector",
+    tests_require = ["nose", "mock"],
+    test_suite = "nose.collector",
 
-    entry_points={
+    entry_points = {
         'console_scripts': ['nova = novaclient.shell:main']
     }
 )