Convert 'untrustedpython' to a proper extra using python_version

zopefoundation · Sep 20, 2017 · 0679c18 · 0679c18
1 parent f7f3a1d
commit 0679c18
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/setup.py b/setup.py
@@ -140,7 +140,7 @@ def __str__(self):
           read('README.rst')
           + '\n\n' +
           read('CHANGES.rst')
-          ),
+      ),
       keywords="zope security policy principal permission",
       classifiers=[
           'Development Status :: 5 - Production/Stable',
@@ -161,7 +161,7 @@ def __str__(self):
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3',
       ],
-      url='http://pypi.python.org/pypi/zope.security',
+      url='http://github.com/zopefoundation/zope.security',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir={'': 'src'},
@@ -181,14 +181,23 @@ def __str__(self):
           'zope.schema',
       ],
       tests_require=TESTS_REQUIRE,
-      extras_require=dict(
-          pytz=["pytz"],
-          untrustedpython=['zope.untrustedpython'] if not py3 else [],
-          zcml=['zope.configuration'],
-          test=TESTS_REQUIRE,
-          testing=TESTS_REQUIRE + ['nose', 'coverage'],
-          docs=['Sphinx', 'repoze.sphinx.autointerface'],
-      ),
+      extras_require={
+          'pytz': [
+              "pytz"
+          ],
+          'untrustedpython:python_version == "2.7"': [
+              'zope.untrustedpython',
+          ],
+          'untrustedpython:python_version >= "3.3"': [],
+          'zcml': [
+              'zope.configuration'
+          ],
+          'test': TESTS_REQUIRE,
+          'docs': [
+              'Sphinx',
+              'repoze.sphinx.autointerface',
+          ],
+      },
       include_package_data=True,
       zip_safe=False,
 )