diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 3cad1aafe06c3..594ee6bd5c835 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -2,30 +2,37 @@ lib, buildPythonPackage, fetchPypi, + setuptools, substituteAll, graphviz, pytestCheckHook, chardet, + parameterized, pythonOlder, pyparsing, }: buildPythonPackage rec { pname = "pydot"; - version = "2.0.0"; - format = "setuptools"; + version = "3.0.2"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; + hash = "sha256-kYDaVAtRs6oJ+/gRQLPt++IxXXeOhYmn0KSmnEEzK64="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ + setuptools + ]; + + dependencies = [ pyparsing ]; nativeCheckInputs = [ chardet + parameterized pytestCheckHook ]; @@ -36,29 +43,15 @@ buildPythonPackage rec { }) ]; - postPatch = '' - # test_graphviz_regression_tests also fails upstream: https://github.com/pydot/pydot/pull/198 - substituteInPlace test/pydot_unittest.py \ - --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" \ - # Patch path for pytestCheckHook - substituteInPlace test/pydot_unittest.py \ - --replace "shapefile_dir = os.path.join(test_dir, 'from-past-to-future')" "shapefile_dir = 'test/from-past-to-future'" \ - --replace "path = os.path.join(test_dir, TESTS_DIR_1)" "path = os.path.join('test/', TESTS_DIR_1)" - ''; - - pytestFlagsArray = [ "test/pydot_unittest.py" ]; - - disabledTests = [ - # broken, fixed after 2.0.0 - "test_graph_with_shapefiles" - ]; + pytestFlagsArray = [ "test/test_pydot.py" ]; pythonImportsCheck = [ "pydot" ]; - meta = with lib; { + meta = { description = "Allows to create both directed and non directed graphs from Python"; homepage = "https://github.com/erocarrera/pydot"; - license = licenses.mit; + changelog = "https://github.com/pydot/pydot/blob/v${version}/ChangeLog"; + license = lib.licenses.mit; maintainers = [ ]; }; }