summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-07-31 18:37:25 +1200
committerRobert Collins <rbtcollins@hp.com>2015-07-31 18:50:44 +1200
commitac0889ebd3a2b109c2017c48977d94d7514c330a (patch)
tree34616f709587285bb950a5972caeacc56be3c740
parent57271fabd3323bf903dea2921e613be8e9bd0884 (diff)
downloadmock-ac0889ebd3a2b109c2017c48977d94d7514c330a.tar.gz
Issue #295: use a setup_requires dependency
Rather than hand-checking, let setuptools do the checking. This avoids issues with distutils being unable to parse some setuptools release versions, which could bite us in future.
-rwxr-xr-xsetup.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/setup.py b/setup.py
index 161016b..5f727ae 100755
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,6 @@
#!/usr/bin/env python
-from distutils.version import StrictVersion
import setuptools
-import sys
-
-
-# Setuptools 17.1 is required, and setup_requires cannot upgrade setuptools
-# in-place, nor trigger the use of a newer version. Abort cleanly up-front.
-setuptools_required = StrictVersion("17.1")
-setuptools_installed = StrictVersion(setuptools.__version__)
-if setuptools_installed < setuptools_required:
- sys.stderr.write(
- "mock requires setuptools>=17.1. Aborting installation\n")
- sys.exit(1)
setuptools.setup(
- setup_requires=['pbr>=1.3'],
+ setup_requires=['pbr>=1.3', 'setuptools>=17.1'],
pbr=True)