Github issue #127, #128

mpenning · Jan 26, 2019 · 152f2da · 152f2da
1 parent a6e30f2
commit 152f2da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,6 @@
 colorama
 passlib
+dnspython
 
 [:python_version<'3']
 ipaddr>=2.1.11
-dnspython
-
-[:python_version>='3']
-ipaddress
-dnspython3
diff --git a/setup.py b/setup.py
@@ -15,20 +15,11 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
-## Comment out for Github issue #127
 ## Conditionally require the correct ipaddr package in Python2 vs Python3
-#if sys.version_info[0]<3:
-#    IPADDR = "ipaddr>=2.1.11"
-#    DNSPYTHON = "dnspython"
-#else:
-#    IPADDR = "ipaddress"
-#    DNSPYTHON = "dnspython3"
-
 # Ref Github issue #127 - sdist improvements
-REQUIRES = ['colorama', 'passlib']
+REQUIRES = ['colorama', 'passlib', 'dnspython']
 EXTRAS = {
-    ":python_version<'3'": ['ipaddr>=2.1.11', 'dnspython'],
-    ":python_version>'3.0'": ['ipaddress', 'dnspython3'],
+    ":python_version<'3'": ['ipaddr>=2.1.11'],
 }
 
 setup(name='ciscoconfparse',