git.iko.soy/typeable/nixpkgs
on master help sign in
python.pkgs.graphviz: 0.10.1 -> 0.14.1
commitec62be5eb1cce0afaaa51753cda967a387a82c3b authorRobert Schütz <dev@schuetz-co.de> dateThu 27 Aug 2020, 09:57 (6 years ago) parentc631a19
2 files changed+31−46
pkgs/development/python-modules/graphviz/default.nix+2−2 pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch+29−44
pkgs/development/python-modules/graphviz/default.nix+2−2
@@ -13,14 +13,14 @@
1313
1414buildPythonPackage rec {
1515 pname = "graphviz";
16− version = "0.10.1";
16+ version = "0.14.1";
1717
1818 # patch does not apply to PyPI tarball due to different line endings
1919 src = fetchFromGitHub {
2020 owner = "xflr6";
2121 repo = "graphviz";
2222 rev = version;
23− sha256 = "1vqk4xy45c72la56j24z9jmjp5a0aa2k32fybnlbkzqjvvbl72d8";
23+ sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c";
2424 };
2525
2626 patches = [
pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch+29−44
@@ -1,38 +1,39 @@
11diff --git a/graphviz/backend.py b/graphviz/backend.py
2−index 704017b..fe4aefe 100644
2+index 6f4cc0c..bc4781e 100644
33--- a/graphviz/backend.py
44+++ b/graphviz/backend.py
5−@@ -114,7 +114,7 @@ def command(engine, format, filepath=None, renderer=None, formatter=None):
6− suffix = '.'.join(reversed(format_arg))
7− format_arg = ':'.join(format_arg)
5+@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
6+ raise ValueError('unknown formatter: %r' % formatter)
87
9−- cmd = [engine, '-T%s' % format_arg]
10−+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % format_arg]
11− rendered = None
12− if filepath is not None:
13− cmd.extend(['-O', filepath])
14−@@ -217,7 +217,7 @@ def version():
8+ output_format = [f for f in (format_, renderer, formatter) if f is not None]
9+- cmd = [engine, '-T%s' % ':'.join(output_format)]
10++ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)]
11+
12+ if filepath is None:
13+ rendered = None
14+@@ -255,7 +255,7 @@ def version():
1515 subprocess.CalledProcessError: If the exit status is non-zero.
1616 RuntimmeError: If the output cannot be parsed into a version number.
1717 """
1818- cmd = ['dot', '-V']
1919+ cmd = ['@graphviz@/bin/dot', '-V']
20− out, _ = run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
21−
22− info = out.decode('ascii')
20+ out, _ = run(cmd, check=True, encoding='ascii',
21+ stdout=subprocess.PIPE,
22+ stderr=subprocess.STDOUT)
2323diff --git a/tests/test_backend.py b/tests/test_backend.py
24−index 7ec12f7..2e8550d 100644
24+index 9f307f5..e43bf5b 100644
2525--- a/tests/test_backend.py
2626+++ b/tests/test_backend.py
27−@@ -47,6 +47,7 @@ def test_render_formatter_unknown():
28− render('dot', 'ps', 'nonfilepath', 'ps', '')
27+@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
28+ m.decode.assert_called_once_with(encoding)
2929
3030
31+-@pytest.exe
3132+@pytest.mark.skip(reason='empty $PATH has no effect')
3233 @pytest.mark.usefixtures('empty_path')
33− def test_render_missing_executable():
34− with pytest.raises(ExecutableNotFound, match=r'execute'):
35−@@ -85,7 +86,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):
34+ @pytest.mark.parametrize('func, args', [
35+ (render, ['dot', 'pdf', 'nonfilepath']),
36+@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
3637
3738 assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
3839
@@ -40,25 +41,17 @@ index 7ec12f7..2e8550d 100644
4041+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'],
4142 stdout=subprocess.PIPE,
4243 stderr=subprocess.PIPE,
43− startupinfo=mocker.ANY)
44−@@ -94,6 +95,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):
45− assert capsys.readouterr() == ('', '' if quiet else 'stderr')
46−
47−
48−+@pytest.mark.skip(reason='empty $PATH has no effect')
49− @pytest.mark.usefixtures('empty_path')
50− def test_pipe_missing_executable():
51− with pytest.raises(ExecutableNotFound, match=r'execute'):
52−@@ -143,7 +145,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
53− assert e.value.returncode is mocker.sentinel.returncode
44+ cwd=None, startupinfo=mocker.ANY)
45+@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
5446 assert e.value.stdout is mocker.sentinel.out
55− assert e.value.stderr is err
47+ e.value.stdout = mocker.sentinel.new_stdout
48+ assert e.value.stdout is mocker.sentinel.new_stdout
5649- Popen.assert_called_once_with(['dot', '-Tpng'],
5750+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
5851 stdin=subprocess.PIPE,
5952 stdout=subprocess.PIPE,
6053 stderr=subprocess.PIPE,
61−@@ -166,7 +168,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
54+@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
6255
6356 assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
6457
@@ -67,16 +60,8 @@ index 7ec12f7..2e8550d 100644
6760 stdin=subprocess.PIPE,
6861 stdout=subprocess.PIPE,
6962 stderr=subprocess.PIPE,
70−@@ -176,6 +178,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
71− assert capsys.readouterr() == ('', '' if quiet else 'stderr')
72−
73−
74−+@pytest.mark.skip(reason='empty $PATH has no effect')
75− @pytest.mark.usefixtures('empty_path')
76− def test_version_missing_executable():
77− with pytest.raises(ExecutableNotFound, match=r'execute'):
78−@@ -196,7 +199,7 @@ def test_version_parsefail_mocked(mocker, Popen):
79− with pytest.raises(RuntimeError):
63+@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
64+ with pytest.raises(RuntimeError, match=r'nonversioninfo'):
8065 version()
8166
8267- Popen.assert_called_once_with(['dot', '-V'],
@@ -84,9 +69,9 @@ index 7ec12f7..2e8550d 100644
8469 stdout=subprocess.PIPE,
8570 stderr=subprocess.STDOUT,
8671 startupinfo=mocker.ANY)
87−@@ -211,7 +214,7 @@ def test_version_mocked(mocker, Popen):
72+@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
8873
89− assert version() == (1, 2, 3)
74+ assert version() == expected
9075
9176- Popen.assert_called_once_with(['dot', '-V'],
9277+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'],