Merge branch 'release/1.2.1'

portalocker/__about__.py

@@ -1,7 +1,7 @@
 __package_name__ = 'portalocker'
 __author__ = 'Rick van Hattem'
 __email__ = 'wolph@wol.ph'
-__version__ = '1.2.0'
+__version__ = '1.2.1'
 __description__ = '''Wraps the portalocker recipe for easy usage'''
 __url__ = 'https://github.com/WoLpH/portalocker'
 

portalocker/__init__.py

@@ -11,7 +11,7 @@
 #: Current author's email address
 __email__ = __about__.__email__
 #: Version number
-__version__ = '1.2.0'
+__version__ = '1.2.1'
 #: Package description for Pypi
 __description__ = __about__.__description__
 #: Package homepage

setup.py

@@ -1,10 +1,19 @@
 from __future__ import print_function
-
 import re
 import os
 import sys
 import setuptools
 from setuptools.command.test import test as TestCommand
+from distutils.version import StrictVersion
+from setuptools import __version__ as setuptools_version
+
+
+if StrictVersion(setuptools_version) < StrictVersion('38.3.0'):
+    raise SystemExit(
+        'Your `setuptools` version is old. '
+        'Please upgrade setuptools by running `pip install -U setuptools` '
+        'and try again.'
+    )
 
 
 # To prevent importing about and thereby breaking the coverage info we use this
@@ -14,8 +23,6 @@
     exec(fp.read(), about)
 
 
-install_requires = []
-setup_requires = []
 tests_require = [
     'flake8>=3.5.0',
     'pytest>=3.4.0',
@@ -27,10 +34,6 @@
 ]
 
 
-if os.name == 'nt':
-    install_requires.append('pypiwin32')
-
-
 class PyTest(TestCommand):
     user_options = [('pytest-args=', 'a', "Arguments to pass to pytest")]
 
@@ -131,14 +134,15 @@ def run(self):
             'combine': Combine,
             'test': PyTest,
         },
-        install_requires=install_requires,
-        setup_requires=setup_requires,
+        install_requires=[
+            'pypiwin32; platform_system == "Windows"',
+        ],
         tests_require=tests_require,
-        extras_require={
-            'docs': [
-                'sphinx<1.7.0',
+        extras_require=dict(
+            docs=[
+                'sphinx>=1.7.1',
             ],
-            'tests': tests_require,
-        },
+            tests=tests_require,
+        ),
     )