diff options
Diffstat (limited to 'pkgs/development/python-modules/pynetdicom/default.nix')
-rw-r--r-- | pkgs/development/python-modules/pynetdicom/default.nix | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 6f0407aacdff3..d5126f11169c8 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -29,10 +29,22 @@ buildPythonPackage rec { patches = [ (fetchpatch { - name = "fix-python-3.11-test-attribute-errors"; + name = "fix-python-3.11-test-attribute-errors.patch"; url = "https://github.com/pydicom/pynetdicom/pull/754/commits/2126bd932d6dfb3f07045eb9400acb7eaa1b3069.patch"; hash = "sha256-t6Lg0sTZSWIE5q5pkBvEoHDQ+cklDn8SgNBcFk1myp4="; }) + (fetchpatch { + # https://github.com/pydicom/pynetdicom/pull/848 + name = "replace-setup-with-setup_method1.patch"; + url = "https://github.com/pydicom/pynetdicom/commit/09b4e0901445d46868668bc69a7b4f7f00cf6cbb.patch"; + hash = "sha256-1ea1A/LU6qY+hd23b6H4OkKHQ0hI2/MYgBgZUZE0kRU="; + }) + (fetchpatch { + # https://github.com/pydicom/pynetdicom/pull/848 + name = "replace-setup-with-setup_method2.patch"; + url = "https://github.com/pydicom/pynetdicom/commit/3966c2d749eeda718caccf9a88a0495d1823825d.patch"; + hash = "sha256-C4MSfwwxDgr5T0XQMlR5j2wElPu83TqPhjyNDvfBjJs="; + }) ]; build-system = [ setuptools ]; @@ -72,21 +84,23 @@ buildPythonPackage rec { "TestStoreSCUCLI" ]; - disabledTestPaths = [ - # Ignore apps tests - "pynetdicom/apps/tests/" - ] ++ lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/pydicom/pynetdicom/issues/924 - "pynetdicom/tests/test_assoc.py" - "pynetdicom/tests/test_transport.py" - ]; + disabledTestPaths = + [ + # Ignore apps tests + "pynetdicom/apps/tests/" + ] + ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/pydicom/pynetdicom/issues/924 + "pynetdicom/tests/test_assoc.py" + "pynetdicom/tests/test_transport.py" + ]; pythonImportsCheck = [ "pynetdicom" ]; pytestFlagsArray = [ # https://github.com/pydicom/pynetdicom/issues/923 "-W" - "ignore::pytest.PytestRemovedIn8Warning" + "ignore::pytest.PytestRemovedIn9Warning" ]; meta = with lib; { |