Make dependency requirements consistent

6 files changed, 23 insertions, 17 deletions

diff --git a/README.md b/README.md
index 72dd48f..fdc7d5f 100644
--- a/README.md
+++ b/README.md
@@ -33,18 +33,20 @@ Instructions for running in a Docker container are also available
 
 ### Dependencies
 
-* python (2.7/3.5/3.6/3.7/3.8/3.9) - http://www.python.org/
+* python (2.7, 3.5 - 3.9) - http://www.python.org/
 
 * dnspython (1.13.0 or later) - http://www.dnspython.org/
 
-* pygraphviz (1.4 or later) - http://pygraphviz.github.io/
+* pygraphviz (1.3 or later) - http://pygraphviz.github.io/
 
 * M2Crypto (0.37.0 or later) - https://gitlab.com/m2crypto/m2crypto
 
-Note that earlier versions of the softwarre listed above might also work with
+Note that earlier versions of the software listed above might also work with
 DNSViz, but with some caveats.  For example, M2Crypto 0.28.0 and later will
-work, but versions earlier than 0.37.0 lack support for DNSSEC algorithms 15
-(Ed25519) and 16 (Ed448).
+work, but versions of M2Crypto earlier than 0.37.0 lack support for DNSSEC
+algorithms 15 (Ed25519) and 16 (Ed448).  Also, while DNSViz itself still works
+with python 2.7, some versions of its software dependencies have moved on:
+pygraphviz 1.6 and dnspython 2.0.0 dropped support for python 2.7.
 
 
 ### Optional Software
diff --git a/contrib/dnsviz.spec b/contrib/dnsviz.spec
index 37faf84..3cd85f8 100644
--- a/contrib/dnsviz.spec
+++ b/contrib/dnsviz.spec
@@ -11,7 +11,7 @@ BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  graphviz
 BuildRequires:  make
-Requires:       python3-pygraphviz >= 1.4
+Requires:       python3-pygraphviz >= 1.3
 Requires:       python3-m2crypto >= 0.28.0
 Requires:       python3-dns >= 1.13
 
diff --git a/dnsviz/commands/graph.py b/dnsviz/commands/graph.py
index 54fb4fd..8beb188 100644
--- a/dnsviz/commands/graph.py
+++ b/dnsviz/commands/graph.py
@@ -117,11 +117,11 @@ def test_pygraphviz():
             major, minor = release.version.split('.')[:2]
             major = int(major)
             minor = int(re.sub(r'(\d+)[^\d].*', r'\1', minor))
-            if (major, minor) < (1,1):
-                logger.error('''pygraphviz version >= 1.1 is required, but version %s is installed.''' % release.version)
+            if (major, minor) < (1,3):
+                logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
                 sys.exit(2)
         except ValueError:
-            logger.error('''pygraphviz version >= 1.1 is required, but version %s is installed.''' % release.version)
+            logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
             sys.exit(2)
     except ImportError:
         logger.error('''pygraphviz is required, but not installed.''')
diff --git a/dnsviz/commands/grok.py b/dnsviz/commands/grok.py
index 6cdac3e..37e612f 100644
--- a/dnsviz/commands/grok.py
+++ b/dnsviz/commands/grok.py
@@ -141,11 +141,11 @@ def test_pygraphviz():
             major, minor = release.version.split('.')[:2]
             major = int(major)
             minor = int(re.sub(r'(\d+)[^\d].*', r'\1', minor))
-            if (major, minor) < (1,1):
-                logger.error('''pygraphviz version >= 1.1 is required, but version %s is installed.''' % release.version)
+            if (major, minor) < (1,3):
+                logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
                 sys.exit(2)
         except ValueError:
-            logger.error('''pygraphviz version >= 1.1 is required, but version %s is installed.''' % release.version)
+            logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
             sys.exit(2)
     except ImportError:
         logger.error('''pygraphviz is required, but not installed.''')
diff --git a/dnsviz/commands/print.py b/dnsviz/commands/print.py
index 6efb1cd..d2e4524 100644
--- a/dnsviz/commands/print.py
+++ b/dnsviz/commands/print.py
@@ -277,11 +277,11 @@ def test_pygraphviz():
             major, minor = release.version.split('.')[:2]
             major = int(major)
             minor = int(re.sub(r'(\d+)[^\d].*', r'\1', minor))
-            if (major, minor) < (1,1):
-                logger.error('''pygraphviz version >= 1.1 is required, but version %s is installed.''' % release.version)
+            if (major, minor) < (1,3):
+                logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
                 sys.exit(2)
         except ValueError:
-            logger.error('''pygraphviz version >= 1.1 is required, but version %s is installed.''' % release.version)
+            logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
             sys.exit(2)
     except ImportError:
         logger.error('''pygraphviz is required, but not installed.''')
diff --git a/setup.py b/setup.py
index 370ab5e..176e643 100644
--- a/setup.py
+++ b/setup.py
@@ -134,7 +134,7 @@ powers the Web-based analysis available at http://dnsviz.net/ .''',
         data_files=DOC_FILES + DATA_FILES + MAN_FILES + \
                 DOC_EXTRA_FILES + JQUERY_UI_FILES + JQUERY_FILES + RAPHAEL_FILES,
         requires=[
-                'pygraphviz (>=1.4)',
+                'pygraphviz (>=1.3)',
                 'm2crypto (>=0.37.0)',
                 'dnspython (>=1.13)',
         ],
@@ -149,7 +149,11 @@ powers the Web-based analysis available at http://dnsviz.net/ .''',
                 'Operating System :: MacOS :: MacOS X',
                 'Operating System :: POSIX',
                 'Programming Language :: Python :: 2.7',
-                'Programming Language :: Python :: 3',
+                'Programming Language :: Python :: 3.5',
+                'Programming Language :: Python :: 3.6',
+                'Programming Language :: Python :: 3.7',
+                'Programming Language :: Python :: 3.8',
+                'Programming Language :: Python :: 3.9',
                 'Topic :: Internet :: Name Service (DNS)',
                 'Topic :: Scientific/Engineering :: Visualization',
                 'Topic :: System :: Networking :: Monitoring',