diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-11-02 00:12:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-02 00:12:04 +0100 |
commit | 8326a502725ac011e6f211d49ead19a1691ebc4b (patch) | |
tree | 96d19eb16fd40f5b5740858c98dd6253ec2ecefe /pkgs | |
parent | 814628a45dabfbd2edd61be98dea0baacfd7b335 (diff) | |
parent | 4f4a63cbf8b7b6f8559c271ee7be8c8a446c00b5 (diff) |
Merge pull request #198948 from fabaff/pytest-doctestplus-bump
python310Packages.pytest-doctestplus: 0.11.2 -> 0.12.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/asdf/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/python-modules/pytest-doctestplus/default.nix | 14 |
2 files changed, 33 insertions, 16 deletions
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index ed5fad93244b5..e12f3702a90af 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -3,7 +3,8 @@ , asdf-transform-schemas , astropy , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , importlib-resources , jmespath , jsonschema @@ -25,11 +26,33 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-MuKmmlPRcB/EYW6AD7Pa/4G7rYAYMqe/Vj47Ycn+Pf4="; + src = fetchFromGitHub { + owner = "asdf-format/"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-u8e7ot5NDRqQFH0eLVnGinBQmQD73BlR5K9HVjA7SIg="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + patches = [ + # Fix default validation, https://github.com/asdf-format/asdf/pull/1203 + (fetchpatch { + name = "default-validation.patch"; + url = "https://github.com/asdf-format/asdf/commit/6f79f620b4632e20178d9bd53528702605d3e976.patch"; + sha256 = "sha256-h/dYhXRCf5oIIC+u6+8C91mJnmEzuNmlEzqc0UEhLy0="; + excludes = [ + "CHANGES.rst" + ]; + }) + ]; + + postPatch = '' + # https://github.com/asdf-format/asdf/pull/1203 + substituteInPlace pyproject.toml \ + --replace "'jsonschema >=4.0.1, <4.10.0'," "'jsonschema >=4.0.1'," + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -62,6 +85,10 @@ buildPythonPackage rec { "asdf" ]; + disabledTests = [ + "config.rst" + ]; + meta = with lib; { description = "Python tools to handle ASDF files"; homepage = "https://github.com/asdf-format/asdf"; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 5752bca4f66ff..9f722ca92836f 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , packaging , pytest @@ -11,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.11.2"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f393adf659709a5f111d6ca190871c61808a6f3611bd0a132e27e93b24dd3448"; + hash = "sha256-epeeS+mdkRbgesBmxfANRfOHZ319d5877zDG/6jHkYE="; }; nativeBuildInputs = [ @@ -37,15 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Removal of distutils, https://github.com/astropy/pytest-doctestplus/pull/172 - (fetchpatch { - name = "distutils-removal.patch"; - url = "https://github.com/astropy/pytest-doctestplus/commit/ae2ee14cca0cde0fab355936995fa083529b00ff.patch"; - sha256 = "sha256-uryKV7bWw2oz0glyh2lpGqtDPFvRTo8RmI1N1n15/d4="; - }) - ]; - disabledTests = [ # ERROR: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...] # __main__.py: error: unrecognized arguments: --remote-data |