#1268: fix setup.py's extra_require

giampaolo · Apr 13, 2018 · 91b0d9c · 91b0d9c
1 parent feded95
commit 91b0d9c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,5 +1,15 @@
 *Bug tracker at https://github.com/giampaolo/psutil/issues*
 
+5.4.5
+=====
+
+2018-04-14
+
+**Bug fixes**
+
+- 1268_: setup.py's extra_require parameter requires latest setuptools version,
+  breaking quite a lot of installations.
+
 5.4.4
 =====
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -2624,6 +2624,10 @@ take a look at the
 Timeline
 ========
 
+- 2018-04-14:
+  `5.4.5 <https://pypi.python.org/pypi?name=psutil&version=5.4.5&:action=files>`__ -
+  `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#545>`__ -
+  `diff <https://github.com/giampaolo/psutil/compare/release-5.4.4...release-5.4.5#files_bucket>`__
 - 2018-04-13:
   `5.4.4 <https://pypi.python.org/pypi?name=psutil&version=5.4.4&:action=files>`__ -
   `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#544>`__ -

diff --git a/psutil/__init__.py b/psutil/__init__.py
@@ -218,7 +218,7 @@
 ]
 __all__.extend(_psplatform.__extra__all__)
 __author__ = "Giampaolo Rodola'"
-__version__ = "5.4.4"
+__version__ = "5.4.5"
 version_info = tuple([int(num) for num in __version__.split('.')])
 AF_LINK = _psplatform.AF_LINK
 POWER_TIME_UNLIMITED = _common.POWER_TIME_UNLIMITED

diff --git a/setup.py b/setup.py
@@ -52,6 +52,18 @@
 if POSIX:
     sources.append('psutil/_psutil_posix.c')
 
+tests_require = []
+if sys.version_info[:2] <= (2, 6):
+    tests_require.append('unittest2')
+if sys.version_info[:2] <= (2, 7):
+    tests_require.append('mock')
+if sys.version_info[:2] <= (3, 2):
+    tests_require.append('ipaddress')
+
+extras_require = {}
+if sys.version_info[:2] <= (3, 3):
+    extras_require.update(dict(enum='enum34'))
+
 
 def get_version():
     INIT = os.path.join(HERE, 'psutil/__init__.py')
@@ -328,14 +340,8 @@ def main():
         kwargs.update(
             python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
             test_suite="psutil.tests.get_suite",
-            tests_require=[
-                'ipaddress; python_version < "3.3"',
-                'mock; python_version < "3.3"',
-                'unittest2; python_version < "2.7"',
-            ],
-            extras_require={
-                'enum': 'enum34; python_version < "3.4"',
-            },
+            tests_require=tests_require,
+            extras_require=extras_require,
             zip_safe=False,
         )
     setup(**kwargs)