make setup.py more declarative

collective · Oct 19, 2023 · be4d155 · be4d155
1 parent 13f0ebb
commit be4d155
Showing 1 changed file with 17 additions and 25 deletions.
diff --git a/setup.py b/setup.py
@@ -11,29 +11,6 @@
     + open(os.path.join("docs", "FAQ.txt")).read()
 )
 
-install_requires = [
-    'setuptools',
-    'zope.i18nmessageid',
-    'collective.quickupload',
-    'collective.plonefinder',
-    'plone.app.uuid',
-    'plone.api',
-]
-
-pytest_extra = [
-    "pytest",
-    "gocept.pytestlayer",
-    "requests",
-    "beautifulsoup4",
-]
-
-if sys.version_info[0] < 3:
-    install_requires.append('demjson')
-    pytest_extra.append('pathlib2')
-else:
-    install_requires.append('demjson3')
-
-
 setup(
     name='collective.ckeditor',
     version=version,
@@ -66,15 +43,30 @@
     namespace_packages=['collective'],
     include_package_data=True,
     zip_safe=False,
-    install_requires=install_requires,
+    install_requires=[
+        'setuptools',
+        'zope.i18nmessageid',
+        'collective.quickupload',
+        'collective.plonefinder',
+        'plone.app.uuid',
+        'plone.api',
+        'demjson;python_version<"3"',
+        'demjson3;python_version>="3"',
+    ],
     packages=find_packages('src'),
     package_dir={'': 'src'},
     extras_require=dict(
         test=[
             'plone.app.testing',
             'plone.app.robotframework[debug]',
         ],
-        pytest=pytest_extra,
+        pytest=[
+            "pytest",
+            "gocept.pytestlayer",
+            "pathlib2;python_version<'3'",
+            "requests",
+            "beautifulsoup4",
+        ],
     ),
     entry_points={
         'console_scripts': [