From 22fe00429e69582fe5a184d0907a1376537c7065 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Dec 2021 19:56:57 +0100 Subject: [PATCH] python3Packages.seqdiag: 2.0.0 -> 3.0.0 --- .../python-modules/seqdiag/default.nix | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 2ae9defc504e..c27a2eb2c91c 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -1,25 +1,49 @@ -{ lib, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils +{ lib , blockdiag +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "seqdiag"; - version = "2.0.0"; - disabled = isPy27; + version = "3.0.0"; + format = "setuptools"; - src = fetchurl { - url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz"; - sha256 = "0k7j4f9j3d0325piwvbv90nfh0wzfk2n6s73s6h6nsxmqshcgswk"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "blockdiag"; + repo = pname; + rev = version; + sha256 = "sha256-Dh9JMx50Nexi0q39rYr9MpkKmQRAfT7lzsNOXoTuphg="; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + propagatedBuildInputs = [ + blockdiag + setuptools + ]; - propagatedBuildInputs = [ blockdiag ]; + checkInputs = [ + nose + pytestCheckHook + ]; - # Tests fail: - # ... - # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') - doCheck = false; + pytestFlagsArray = [ + "src/seqdiag/tests/" + ]; + + disabledTests = [ + # UnicodeEncodeError: 'latin-1' codec can't encode... + "test_setup_inline_svg_is_true_with_multibytes" + ]; + + pythonImportsCheck = [ + "seqdiag" + ]; meta = with lib; { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";