nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

python.pkgs.graphviz: 0.10.1 -> 0.14.1

Browse Source
This commit is contained in:
Robert Schütz 2020-08-27 09:57:18 +02:00 committed by Jon
parent c631a19ded
commit ec62be5eb1
2 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/graphviz/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "graphviz"; pname = "graphviz";
version = "0.10.1"; version = "0.14.1";
# patch does not apply to PyPI tarball due to different line endings # patch does not apply to PyPI tarball due to different line endings
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xflr6"; owner = "xflr6";
repo = "graphviz"; repo = "graphviz";
rev = version; rev = version;
sha256 = "1vqk4xy45c72la56j24z9jmjp5a0aa2k32fybnlbkzqjvvbl72d8"; sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c";
}; };
patches = [ patches = [

73
pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
View File

@ -1,38 +1,39 @@
diff --git a/graphviz/backend.py b/graphviz/backend.py diff --git a/graphviz/backend.py b/graphviz/backend.py
index 704017b..fe4aefe 100644 index 6f4cc0c..bc4781e 100644
--- a/graphviz/backend.py --- a/graphviz/backend.py
+++ b/graphviz/backend.py +++ b/graphviz/backend.py
@@ -114,7 +114,7 @@ def command(engine, format, filepath=None, renderer=None, formatter=None): @@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
suffix = '.'.join(reversed(format_arg)) raise ValueError('unknown formatter: %r' % formatter)
format_arg = ':'.join(format_arg)
- cmd = [engine, '-T%s' % format_arg] output_format = [f for f in (format_, renderer, formatter) if f is not None]
+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % format_arg] - cmd = [engine, '-T%s' % ':'.join(output_format)]
rendered = None + cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)]
if filepath is not None:
cmd.extend(['-O', filepath]) if filepath is None:
@@ -217,7 +217,7 @@ def version(): rendered = None
@@ -255,7 +255,7 @@ def version():
subprocess.CalledProcessError: If the exit status is non-zero. subprocess.CalledProcessError: If the exit status is non-zero.
RuntimmeError: If the output cannot be parsed into a version number. RuntimmeError: If the output cannot be parsed into a version number.
""" """
- cmd = ['dot', '-V'] - cmd = ['dot', '-V']
+ cmd = ['@graphviz@/bin/dot', '-V'] + cmd = ['@graphviz@/bin/dot', '-V']
out, _ = run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = run(cmd, check=True, encoding='ascii',
stdout=subprocess.PIPE,
info = out.decode('ascii') stderr=subprocess.STDOUT)
diff --git a/tests/test_backend.py b/tests/test_backend.py diff --git a/tests/test_backend.py b/tests/test_backend.py
index 7ec12f7..2e8550d 100644 index 9f307f5..e43bf5b 100644
--- a/tests/test_backend.py --- a/tests/test_backend.py
+++ b/tests/test_backend.py +++ b/tests/test_backend.py
@@ -47,6 +47,7 @@ def test_render_formatter_unknown(): @@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
render('dot', 'ps', 'nonfilepath', 'ps', '') m.decode.assert_called_once_with(encoding)
-@pytest.exe
+@pytest.mark.skip(reason='empty $PATH has no effect') +@pytest.mark.skip(reason='empty $PATH has no effect')
@pytest.mark.usefixtures('empty_path') @pytest.mark.usefixtures('empty_path')
def test_render_missing_executable(): @pytest.mark.parametrize('func, args', [
with pytest.raises(ExecutableNotFound, match=r'execute'): (render, ['dot', 'pdf', 'nonfilepath']),
@@ -85,7 +86,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): @@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf' assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
@ -40,25 +41,17 @@ index 7ec12f7..2e8550d 100644
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
startupinfo=mocker.ANY) cwd=None, startupinfo=mocker.ANY)
@@ -94,6 +95,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): @@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
assert capsys.readouterr() == ('', '' if quiet else 'stderr')
+@pytest.mark.skip(reason='empty $PATH has no effect')
@pytest.mark.usefixtures('empty_path')
def test_pipe_missing_executable():
with pytest.raises(ExecutableNotFound, match=r'execute'):
@@ -143,7 +145,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
assert e.value.returncode is mocker.sentinel.returncode
assert e.value.stdout is mocker.sentinel.out assert e.value.stdout is mocker.sentinel.out
assert e.value.stderr is err e.value.stdout = mocker.sentinel.new_stdout
assert e.value.stdout is mocker.sentinel.new_stdout
- Popen.assert_called_once_with(['dot', '-Tpng'], - Popen.assert_called_once_with(['dot', '-Tpng'],
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
@@ -166,7 +168,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 @@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
@ -67,16 +60,8 @@ index 7ec12f7..2e8550d 100644
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
@@ -176,6 +178,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 @@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
assert capsys.readouterr() == ('', '' if quiet else 'stderr') with pytest.raises(RuntimeError, match=r'nonversioninfo'):
+@pytest.mark.skip(reason='empty $PATH has no effect')
@pytest.mark.usefixtures('empty_path')
def test_version_missing_executable():
with pytest.raises(ExecutableNotFound, match=r'execute'):
@@ -196,7 +199,7 @@ def test_version_parsefail_mocked(mocker, Popen):
with pytest.raises(RuntimeError):
version() version()
- Popen.assert_called_once_with(['dot', '-V'], - Popen.assert_called_once_with(['dot', '-V'],
@ -84,9 +69,9 @@ index 7ec12f7..2e8550d 100644
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
startupinfo=mocker.ANY) startupinfo=mocker.ANY)
@@ -211,7 +214,7 @@ def test_version_mocked(mocker, Popen): @@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
assert version() == (1, 2, 3) assert version() == expected
- Popen.assert_called_once_with(['dot', '-V'], - Popen.assert_called_once_with(['dot', '-V'],
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'],