Specify doit versions in setup.py instead of requirements.txt

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 10, 2017 · 46186d1 · 46186d1
1 parent 17d00a1
commit 46186d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/requirements-rtd.txt b/requirements-rtd.txt
@@ -0,0 +1,2 @@
+-r requirements.txt
+doit
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,3 @@
-doit>=0.28.0,<=0.29.0 ; python_version <= '3.3' # rq.filter: <=0.29.0
-doit>=0.28.0 ; python_version >= '3.4'
 Pygments>=1.6
 Pillow>=2.4.0
 python-dateutil>=2.4.0

diff --git a/setup.py b/setup.py
@@ -26,7 +26,10 @@ def run_tests(self):
 with open('requirements.txt', 'r') as fh:
     dependencies = [l.strip() for l in fh]
 
-extras = {}
+extras = {
+    ':python_version >= "3.4"': ['doit>=0.28.0'],
+    ':python_version <= "3.3"': ['doit>=0.28.0,<=0.29.0'],
+}
 
 with open('requirements-extras.txt', 'r') as fh:
     extras['extras'] = [l.strip() for l in fh][1:]