Fix setup.py and setup.cfg dependencies for secure extra (urllib3#1497)

speedplane · Dec 10, 2018 · f80ff34 · f80ff34
1 parent 0aa3e24
commit f80ff34
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -11,9 +11,9 @@ provides-extra =
     secure
     socks
 requires-dist =
-    pyOpenSSL>=0.14; python_version=="2.7" and extra == 'secure'
-    cryptography>=1.3.4; python_version=="2.7" and extra == 'secure'
-    idna>=2.0.0; python_version=="2.7" and extra == 'secure'
+    pyOpenSSL>=0.14; extra == 'secure'
+    cryptography>=1.3.4; extra == 'secure'
+    idna>=2.0.0; extra == 'secure'
     certifi; extra == 'secure'
     ipaddress; python_version=="2.7" and extra == 'secure'
     PySocks>=1.5.6,<2.0,!=1.5.7; extra == 'socks'

diff --git a/setup.py b/setup.py
@@ -65,11 +65,11 @@
       test_suite='test',
       extras_require={
           'secure': [
-              'pyOpenSSL >= 0.14',
+              'pyOpenSSL>=0.14',
               'cryptography>=1.3.4',
               'idna>=2.0.0',
               'certifi',
-              "ipaddress",
+              "ipaddress; python_version=='2.7'",
           ],
           'socks': [
               'PySocks>=1.5.6,<2.0,!=1.5.7',