Merge pull request #399 from jdufresne/py26

Remove Python 2.6 argparse workarounds
pypa · Sep 20, 2018 · 9e850be · 9e850be
2 parents c977b44 + b4aa0d4
commit 9e850be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -16,6 +16,5 @@ requires-dist =
     requests-toolbelt >= 0.8.0
     pkginfo >= 1.4.2
     setuptools >= 0.7.0
-    argparse; python_version == '2.6'
     pyblake2; extra == 'with-blake2' and python_version < '3.6'
     keyring; extra == 'keyring'
diff --git a/setup.py b/setup.py
@@ -18,21 +18,6 @@
 import twine
 
 
-install_requires = [
-    "tqdm >= 4.14",
-    "pkginfo >= 1.4.2",
-    "readme_renderer >= 21.0",
-    "requests >= 2.5.0, != 2.15, != 2.16",
-    "requests-toolbelt >= 0.8.0",
-    "setuptools >= 0.7.0",
-]
-
-if sys.version_info[:2] < (2, 7):
-    install_requires += [
-        "argparse",
-    ]
-
-
 blake2_requires = []
 
 if sys.version_info[:2] < (3, 6):
@@ -91,7 +76,14 @@
         ],
     },
 
-    install_requires=install_requires,
+    install_requires=[
+        "pkginfo >= 1.4.2",
+        "readme_renderer >= 21.0",
+        "requests >= 2.5.0, != 2.15, != 2.16",
+        "requests-toolbelt >= 0.8.0",
+        "setuptools >= 0.7.0",
+        "tqdm >= 4.14",
+    ],
     extras_require={
         'with-blake2': blake2_requires,
         'keyring': [