b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pythonPackages.graphviz: 0.14.1 -> 0.16

Browse source
This commit is contained in:
Robert Schütz 2021-01-16 10:53:01 +01:00
parent aee78d463e
commit 762622c3c9
2 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/python-modules/graphviz/default.nix
View file

@ -6,21 +6,21 @@
, makeFontsConf
, freefont_ttf
, mock
, pytest
, pytestCheckHook
, pytest-mock
, pytestcov
}:
buildPythonPackage rec {
pname = "graphviz";
version = "0.14.1";
version = "0.16";
# patch does not apply to PyPI tarball due to different line endings
src = fetchFromGitHub {
owner = "xflr6";
repo = "graphviz";
rev = version;
sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c";
sha256 = "147vi60mi57z623lhllwwzczzicv2iwj1yrmllj5xx5788i73j6g";
};
patches = [
@ -35,11 +35,7 @@ buildPythonPackage rec {
fontDirectories = [ freefont_ttf ];
};
checkInputs = [ mock pytest pytest-mock pytestcov ];
checkPhase = ''
pytest
'';
checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ];
meta = with lib; {
description = "Simple Python interface for Graphviz";

56
pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch
View file

@ -1,19 +1,28 @@
diff --git a/graphviz/backend.py b/graphviz/backend.py
index 6f4cc0c..bc4781e 100644
index d2c4b97..f7175cd 100644
--- a/graphviz/backend.py
+++ b/graphviz/backend.py
@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
raise ValueError('unknown formatter: %r' % formatter)
output_format = [f for f in (format_, renderer, formatter) if f is not None]
- cmd = [engine, '-T%s' % ':'.join(output_format)]
+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)]
- cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
+ cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
if filepath is None:
rendered = None
@@ -255,7 +255,7 @@ def version():
subprocess.CalledProcessError: If the exit status is non-zero.
RuntimmeError: If the output cannot be parsed into a version number.
@@ -275,7 +275,7 @@ def unflatten(source,
if fanout and stagger is None:
raise RequiredArgumentError('fanout given without stagger')
- cmd = ['unflatten']
+ cmd = ['@graphviz@/bin/unflatten']
if stagger is not None:
cmd += ['-l', str(stagger)]
if fanout:
@@ -304,7 +304,7 @@ def version():
Graphviz Release version entry format
https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20
"""
- cmd = ['dot', '-V']
+ cmd = ['@graphviz@/bin/dot', '-V']
@ -21,10 +30,10 @@ index 6f4cc0c..bc4781e 100644
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
diff --git a/tests/test_backend.py b/tests/test_backend.py
index 9f307f5..e43bf5b 100644
index d10ef1a..e4aba58 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
m.decode.assert_called_once_with(encoding)
@ -33,34 +42,43 @@ index 9f307f5..e43bf5b 100644
@pytest.mark.usefixtures('empty_path')
@pytest.mark.parametrize('func, args', [
(render, ['dot', 'pdf', 'nonfilepath']),
@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
- Popen.assert_called_once_with(['dot', '-Tpdf', '-O', 'nonfilepath'],
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'],
- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
cwd=None, startupinfo=mocker.ANY)
@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
assert e.value.stdout is mocker.sentinel.out
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(['@graphviz@/bin/dot', '-Tpng'],
- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
- Popen.assert_called_once_with(['dot', '-Tpng'],
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen):
proc.communicate.return_value = (b'nonresult', b'')
assert unflatten('nonsource') == 'nonresult'
- Popen.assert_called_once_with(['unflatten'],
+ Popen.assert_called_once_with(['@graphviz@/bin/unflatten'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
with pytest.raises(RuntimeError, match=r'nonversioninfo'):
version()
@ -69,7 +87,7 @@ index 9f307f5..e43bf5b 100644
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
startupinfo=mocker.ANY)
@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
assert version() == expected