improve setuptools capabilities

Signed-off-by: Hervé Beraud <[email protected]>

Author: 4383

.travis.yml

@@ -2,17 +2,21 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
+  - "nightly"
+jobs:
+  allow_failures:
+    - python: "nightly"
 install:
-  - pip install .
-  - pip install -r requirements-dev.txt
+  - pip install -U setuptools
+  - pip install -e .
+  - pip install -e .[dev]
 script:
   - nosetests
   - python setup.py sdist && pip install dist/ovh-*.tar.gz && cd /tmp && python -c 'import ovh; ovh.Client("ovh-eu").get("/auth/time", _need_auth=False)'
 after_success:
     coveralls
 sudo: false
-

README.rst

@@ -509,7 +509,7 @@ note that we do not accept contributions with test coverage under 100%.
 
 .. code:: bash
 
-    pip install -r requirements-dev.txt
+    pip install -e .[dev]
     nosetests # 100% coverage is a hard minimum
 
 

debian/docs

@@ -2,4 +2,3 @@ README.rst
 CONTRIBUTING.rst
 CHANGELOG.md
 MIGRATION.rst
-requirements-dev.txt

docs/index.rst

@@ -408,7 +408,7 @@ note that we do not accept contributions with test coverage under 100%.
 
 .. code:: bash
 
-    pip install -r requirements-dev.txt
+    pip install -e .[dev]
     nosetests # 100% coverage is a hard minimum
 
 

requirements-dev.txt

@@ -1,3 +1,59 @@
+[metadata]
+name = ovh
+description = "Official OVH.com API wrapper"
+long_description = file: README.rst
+version = 0.4.8
+author = Jean-Tiare Le Bigot
+author_email = [email protected]
+url = http://api.ovh.com
+license = BSD
+keywords = ovh, sdk, rest
+classifiers =
+    License :: OSI Approved :: BSD License
+    Development Status :: 4 - Beta
+    Intended Audience :: Developers
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 2.6
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Topic :: Software Development :: Libraries :: Python Modules
+    Topic :: System :: Archiving :: Packaging
+
+[options]
+packages = find:
+setup_requires =
+    setuptools>=30.3.0
+include_package_data = True
+
+[options.package_data]
+ovh.vendor.requests = *.pem
+
+[options.packages.find]
+exclude =
+    tests
+
+[options.extras_require]
+dev =
+    coverage==3.7.1
+    mock==1.0.1
+    nose==1.3.3
+    yanc==0.2.4
+    Sphinx==1.2.2
+    coveralls==0.4.4
+    ordereddict==1.0;python_version<"2.7"
+    setuptools>=30.3.0
+    wheel
+test =
+    coverage==3.7.1
+    mock==1.0.1
+    nose==1.3.3
+    yanc==0.2.4
+
 [test]
 test-suite = nose.collector
 
@@ -8,3 +64,6 @@ with-yanc = 1
 with-coverage = 1
 cover-package = ovh
 cover-erase = 1
+
+[bdist_wheel]
+universal = 1

setup.cfg

@@ -2,51 +2,11 @@
 # -*- coding: utf-8 -*-
 
 try:
-    from setuptools import setup, find_packages
+    from setuptools import setup
 except ImportError:
     from distribute_setup import use_setuptools
     use_setuptools()
-    from setuptools import setup, find_packages
+    from setuptools import setup
 
-# Read README.rst content
-with open('README.rst') as f:
-    readme = f.read()
 
-setup(
-    name = "ovh",
-    version = "0.4.8",
-    setup_requires=['setuptools'],
-    author = "Jean-Tiare Le Bigot",
-    author_email = "[email protected]",
-    description = "Official OVH.com API wrapper",
-    long_description = readme,
-    license = "BSD",
-    keywords = "ovh sdk rest",
-    url = "http://api.ovh.com",
-    packages = find_packages(exclude=['tests']),
-    package_data={
-        'ovh.vendor.requests': ['*.pem'],
-    },
-    include_package_data=True,
-    tests_require=[
-        "coverage==3.7.1",
-        "mock==1.0.1",
-        "nose==1.3.3",
-        "yanc==0.2.4",
-    ],
-    classifiers=[
-        "License :: OSI Approved :: BSD License",
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.2",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: System :: Archiving :: Packaging",
-    ],
-)
+setup()