Merge pull request #688 from plone/use_python_version

use environment-markers instead of python-logic
plone · Mar 7, 2019 · fe6452c · fe6452c
2 parents da6da3c + 2362231
commit fe6452c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/news/688.bugfix b/news/688.bugfix
@@ -0,0 +1,2 @@
+Use environment-markers instead of python-logic to specify dependencies for py2.
+[pbauer]
diff --git a/setup.py b/setup.py
@@ -22,21 +22,14 @@
     'freezegun',
     'plone.tiles',
     'mock',
+    'archetypes.schemaextender ; python_version<"3"',
+    'Products.Archetypes ; python_version<"3"',
+    'Products.contentmigration ; python_version<"3"',
+    'Products.ATContentTypes ; python_version<"3"',
+    'plone.app.blob ; python_version<"3"',
+    'plone.app.collection ; python_version<"3"',
 ]
 
-PY2_ONLY = [
-    'archetypes.schemaextender',
-    'Products.Archetypes',
-    'Products.contentmigration',
-    'Products.ATContentTypes',
-    'plone.app.blob',
-    'plone.app.collection',
-]
-
-if sys.version_info[0] == 2:
-    TEST_REQUIRES += PY2_ONLY
-
-
 setup(name='plone.restapi',
       version=version,
       description="plone.restapi is a RESTful hypermedia API for Plone.",