Merge pull request #263028 from bcdarwin/unbreak-python3-duecredit

python311Packages.duecredit: unbreak, cleanup
This commit is contained in:
Mario Rodas 2023-10-25 08:54:08 -05:00 committed by GitHub
commit 902eebf45e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 10 deletions

View file

@ -1,8 +1,8 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPy27 , pythonOlder
, pytest , setuptools
, pytestCheckHook , pytestCheckHook
, vcrpy , vcrpy
, citeproc-py , citeproc-py
@ -13,16 +13,20 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "duecredit"; pname = "duecredit";
version = "0.9.2"; version = "0.9.2";
disabled = isPy27; pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; hash = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw=";
}; };
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ citeproc-py requests six ]; propagatedBuildInputs = [ citeproc-py requests six ];
nativeCheckInputs = [ pytest pytestCheckHook vcrpy ]; nativeCheckInputs = [ pytestCheckHook vcrpy ];
disabledTests = [ "test_import_doi" ]; # tries to access network
preCheck = '' preCheck = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
@ -33,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/duecredit/duecredit"; homepage = "https://github.com/duecredit/duecredit";
description = "Simple framework to embed references in code"; description = "Simple framework to embed references in code";
changelog = "https://github.com/duecredit/duecredit/releases/tag/${version}";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
}; };

View file

@ -1,15 +1,34 @@
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, lxml, matplotlib { lib
, nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }: , buildPythonPackage
, fetchPypi
, pythonOlder
, pytestCheckHook
, hatch-vcs
, lxml
, matplotlib
, nibabel
, numpy
, pandas
, scikit-learn
, scipy
, joblib
, requests
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "nilearn"; pname = "nilearn";
version = "0.10.1"; version = "0.10.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-koo2Tn7XfRXQK38icZfqfHj0Ty/ngP61VdbXz5Iy+EY="; hash = "sha256-koo2Tn7XfRXQK38icZfqfHj0Ty/ngP61VdbXz5Iy+EY=";
}; };
nativeBuildInputs = [ hatch-vcs ];
nativeCheckInputs = [ pytestCheckHook ]; nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608
# do subset of tests which don't fetch resources # do subset of tests which don't fetch resources
@ -30,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://nilearn.github.io"; homepage = "https://nilearn.github.io";
description = "A module for statistical learning on neuroimaging data"; description = "A module for statistical learning on neuroimaging data";
changelog = "https://github.com/nilearn/nilearn/releases/tag/${version}";
license = licenses.bsd3; license = licenses.bsd3;
}; };
} }

View file

@ -8,7 +8,6 @@
, numpy , numpy
, pandas , pandas
, feedparser , feedparser
, typeguard
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -35,7 +34,6 @@ buildPythonPackage rec {
invoke invoke
pandas pandas
pytestCheckHook pytestCheckHook
typeguard
]; ];
disabledTests = [ disabledTests = [
@ -49,6 +47,8 @@ buildPythonPackage rec {
# can't find mypy stubs for pandas: # can't find mypy stubs for pandas:
"tests/test_mypy.py" "tests/test_mypy.py"
"tests/pandas_/test_mypy_dataframe.py" "tests/pandas_/test_mypy_dataframe.py"
# typeguard release broke nptyping compatibility:
"tests/test_typeguard.py"
# tries to build wheel of package, broken/unnecessary under Nix: # tries to build wheel of package, broken/unnecessary under Nix:
"tests/test_wheel.py" "tests/test_wheel.py"
]; ];

View file

@ -46,8 +46,13 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ]; nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "bids" ]; pythonImportsCheck = [ "bids" ];
disabledTests = [
# looks for missing data: # looks for missing data:
disabledTests = [ "test_config_filename" ]; "test_config_filename"
# regression associated with formulaic >= 0.6.0
# (see https://github.com/bids-standard/pybids/issues/1000)
"test_split"
];
meta = with lib; { meta = with lib; {
description = "Python tools for querying and manipulating BIDS datasets"; description = "Python tools for querying and manipulating BIDS datasets";