dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #198948 from fabaff/pytest-doctestplus-bump

Browse Source 
python310Packages.pytest-doctestplus: 0.11.2 -> 0.12.1
This commit is contained in:
Fabian Affolter 2022-11-02 00:12:04 +01:00 committed by GitHub
commit 8326a50272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/python-modules/asdf/default.nix
View File

@ -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";

14
pkgs/development/python-modules/pytest-doctestplus/default.nix
View File

@ -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