Codebase list dnsviz / 139ab31
Update version checking for pygraphviz 1.7 Casey Deccio 3 years ago
2 changed file(s) with 24 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all
+12
-5
dnsviz/commands/graph.py less more
111111
112112 def test_pygraphviz():
113113 try:
114 from pygraphviz import release
115 try:
116 major, minor = release.version.split('.')[:2]
114 try:
115 # pygraphviz < 1.7 used pygraphviz.release.version
116 from pygraphviz import release
117 version = release.version
118 except ImportError:
119 # pygraphviz 1.7 changed to pygraphviz.__version__
120 from pygraphviz import __version__
121 version = __version__
122 try:
123 major, minor = version.split('.')[:2]
117124 major = int(major)
118125 minor = int(re.sub(r'(\d+)[^\d].*', r'\1', minor))
119126 if (major, minor) < (1,3):
120 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
127 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % version)
121128 sys.exit(2)
122129 except ValueError:
123 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
130 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % version)
124131 sys.exit(2)
125132 except ImportError:
126133 logger.error('''pygraphviz is required, but not installed.''')
+12
-5
dnsviz/commands/print.py less more
271271
272272 def test_pygraphviz():
273273 try:
274 from pygraphviz import release
275 try:
276 major, minor = release.version.split('.')[:2]
274 try:
275 # pygraphviz < 1.7 used pygraphviz.release.version
276 from pygraphviz import release
277 version = release.version
278 except ImportError:
279 # pygraphviz 1.7 changed to pygraphviz.__version__
280 from pygraphviz import __version__
281 version = __version__
282 try:
283 major, minor = version.split('.')[:2]
277284 major = int(major)
278285 minor = int(re.sub(r'(\d+)[^\d].*', r'\1', minor))
279286 if (major, minor) < (1,3):
280 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
287 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % version)
281288 sys.exit(2)
282289 except ValueError:
283 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % release.version)
290 logger.error('''pygraphviz version >= 1.3 is required, but version %s is installed.''' % version)
284291 sys.exit(2)
285292 except ImportError:
286293 logger.error('''pygraphviz is required, but not installed.''')