python.pkgs.dot2tex: enable python3 and run tests

This commit is contained in:
Robert Schütz 2020-06-14 15:10:07 +02:00
parent 029a5de083
commit 0c30b9ef73
4 changed files with 140 additions and 4 deletions

View file

@ -1,8 +1,11 @@
{ stdenv
, python
, buildPythonPackage
, fetchPypi
, isPy3k
, substituteAll
, pyparsing
, graphviz
, texlive
}:
buildPythonPackage rec {
@ -14,11 +17,26 @@ buildPythonPackage rec {
sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9";
};
# Tests fail with 3.x. Furthermore, package is no longer maintained.
disabled = isPy3k;
patches = [
(substituteAll {
src = ./path.patch;
inherit graphviz;
})
./test.patch # https://github.com/kjellmf/dot2tex/issues/5
];
propagatedBuildInputs = [ pyparsing ];
checkInputs = [
(texlive.combine {
inherit (texlive) scheme-small preview pstricks;
})
];
checkPhase = ''
${python.interpreter} tests/test_dot2tex.py
'';
meta = with stdenv.lib; {
description = "Convert graphs generated by Graphviz to LaTeX friendly formats";
homepage = "https://github.com/kjellmf/dot2tex";

View file

@ -0,0 +1,104 @@
diff --git a/dot2tex/dotparsing.py b/dot2tex/dotparsing.py
index 391b5dc..6dc77a3 100644
--- a/dot2tex/dotparsing.py
+++ b/dot2tex/dotparsing.py
@@ -180,18 +180,8 @@ def __find_executables(path):
def find_graphviz():
"""Locate Graphviz's executables in the system.
- Tries three methods:
-
- First: Windows Registry (Windows only)
- This requires Mark Hammond's pywin32 is installed.
-
- Secondly: Search the path
- It will look for 'dot', 'twopi' and 'neato' in all the directories
- specified in the PATH environment variable.
-
- Thirdly: Default install location (Windows only)
- It will look for 'dot', 'twopi' and 'neato' in the default install
- location under the "Program Files" directory.
+ It will look for 'dot', 'twopi' and 'neato' in
+ @graphviz@/bin.
It will return a dictionary containing the program names as keys
and their paths as values.
@@ -199,75 +189,9 @@ def find_graphviz():
If this fails, it returns None.
"""
- # Method 1 (Windows only)
- #
- if os.sys.platform == 'win32':
- try:
- import win32api, win32con
-
- # Get the GraphViz install path from the registry
- #
- hkey = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE,
- "SOFTWARE\AT&T Research Labs\Graphviz", 0, win32con.KEY_QUERY_VALUE)
-
- path = win32api.RegQueryValueEx(hkey, "InstallPath")[0]
- win32api.RegCloseKey(hkey)
-
- # Now append the "bin" subdirectory:
- #
- path = os.path.join(path, "bin")
- progs = __find_executables(path)
- if progs is not None:
- # print("Used Windows registry")
- return progs
-
- except ImportError:
- # Print a messaged suggesting they install these?
- #
- log.debug('The win32api is not installed')
- pass
- except:
- log.debug('Failed to access the registry key')
-
- # Method 2 (Linux, Windows etc)
- #
- if 'PATH' in os.environ:
- for path in os.environ['PATH'].split(os.pathsep):
- progs = __find_executables(path)
- if progs is not None:
- return progs
-
- # Method 3 (Windows only)
- #
- if os.sys.platform == 'win32':
- # Try and work out the equivalent of "C:\Program Files" on this
- # machine (might be on drive D:, or in a different language)
- #
- if 'PROGRAMFILES' in os.environ:
- # Note, we could also use the win32api to get this
- # information, but win32api may not be installed.
-
- path = os.path.join(os.environ['PROGRAMFILES'], 'ATT', 'GraphViz', 'bin')
-
- else:
- # Just in case, try the default...
- path = r"C:\Program Files\att\Graphviz\bin"
-
- progs = __find_executables(path)
-
- if progs is not None:
- # print("Used default install location")
- return progs
-
- for path in (
- '/usr/bin', '/usr/local/bin',
- '/opt/local/bin',
- '/opt/bin', '/sw/bin', '/usr/share',
- '/Applications/Graphviz.app/Contents/MacOS/'):
- progs = __find_executables(path)
- if progs is not None:
- # print("Used path")
- return progs
+ progs = __find_executables('@graphviz@/bin')
+ if progs is not None:
+ return progs
# Failed to find GraphViz
#

View file

@ -0,0 +1,12 @@
diff --git a/tests/test_dot2tex.py b/tests/test_dot2tex.py
index 74b01ed..7be9aba 100644
--- a/tests/test_dot2tex.py
+++ b/tests/test_dot2tex.py
@@ -147,6 +147,7 @@ class NeedsQuotesTests(unittest.TestCase):
class MultipleStatements(unittest.TestCase):
# https://github.com/kjellmf/dot2tex/issues/5
+ @unittest.skip('fails upstream')
def test_semicolon(self):
"""Test for issue 5"""
testgraph1 = """

View file

@ -6773,7 +6773,9 @@ in {
jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { };
dot2tex = callPackage ../development/python-modules/dot2tex { };
dot2tex = callPackage ../development/python-modules/dot2tex {
inherit (pkgs) graphviz;
};
poezio = callPackage ../applications/networking/instant-messengers/poezio {
inherit (pkgs) pkgconfig;