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

python311Packages.duecredit: unbreak, cleanup

pkgs/development/python-modules/duecredit/default.nix

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

pkgs/development/python-modules/nilearn/default.nix

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

pkgs/development/python-modules/nptyping/default.nix

@@ -8,7 +8,6 @@
 , numpy
 , pandas
 , feedparser
-, typeguard
 }:
 
 buildPythonPackage rec {
@@ -35,7 +34,6 @@ buildPythonPackage rec {
     invoke
     pandas
     pytestCheckHook
-    typeguard
   ];
 
   disabledTests = [
@@ -49,6 +47,8 @@ buildPythonPackage rec {
     # can't find mypy stubs for pandas:
     "tests/test_mypy.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:
     "tests/test_wheel.py"
   ];

pkgs/development/python-modules/pybids/default.nix

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