NixOS · drupol · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -8,6 +8,13 @@ function pytestCheckPhase() {
     echo "Executing pytestCheckPhase"
     runHook preCheck
 
+    export HOME=$(mktemp -d)
+
+    # If the path $out/bin exists, add it to the PATH environment variable
+    if [ -d "$out/bin" ]; then
+        export PATH="$out/bin${PATH:+:}$PATH"
+    fi
+
     # Compose arguments
     args=" -m pytest"
     if [ -n "$disabledTests" ]; then

diff --git a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh
@@ -5,6 +5,13 @@ unittestCheckPhase() {
     echo "Executing unittestCheckPhase"
     runHook preCheck
 
+    export HOME=$(mktemp -d)
+
+    # If the path $out/bin exists, add it to the PATH environment variable
+    if [ -d "$out/bin" ]; then
+        export PATH="$out/bin${PATH:+:}$PATH"
+    fi
+
     eval "@pythonCheckInterpreter@ -m unittest discover $unittestFlagsArray"
 
     runHook postCheck

diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
@@ -61,14 +61,9 @@ buildPythonPackage rec {
     pytest7CheckHook
     transformers
   ];
-  preCheck =
-    ''
-      export HOME=$(mktemp -d)
-      export PATH=$out/bin:$PATH
-    ''
-    + lib.optionalString config.cudaSupport ''
-      export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas"
-    '';
+  preCheck = lib.optionalString config.cudaSupport ''
+    export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas"
+  '';
   pytestFlagsArray = [ "tests" ];
   disabledTests =
     [

diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix
@@ -38,10 +38,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
-
   pythonImportsCheck = [ "aeppl" ];
 
   disabledTests = [

diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
@@ -97,8 +97,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   preCheck = ''
-    export PATH=$PATH:$out/bin
-
     # Remove build artifacts to prevent them from messing with the tests
     rm -rf _skbuild
   '';

diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
@@ -39,10 +39,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
-
   pythonImportsCheck = [ "aiodhcpwatcher" ];
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix
@@ -56,8 +56,6 @@ buildPythonPackage rec {
   pytestFlagsArray = [ "--asyncio-mode=auto" ];
 
   preCheck = ''
-    export HOME=$(mktemp -d)
-
     # Need sigstore is an optional dependencies and need <2
     rm -rf tests/test_helper.py
   '';

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
@@ -135,8 +135,6 @@ buildPythonPackage rec {
       # aiohttp in current folder shadows installed version
       rm -r aiohttp
       touch tests/data.unknown_mime_type # has to be modified after 1 Jan 1990
-
-      export HOME=$(mktemp -d)
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # Work around "OSError: AF_UNIX path too long"

diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix
@@ -75,11 +75,6 @@ buildPythonPackage rec {
     "tests/test_client.py"
   ];
 
-  preCheck = ''
-    # Some tests need amqtt
-    export PATH=$out/bin:$PATH
-  '';
-
   pythonImportsCheck = [ "amqtt" ];
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix
@@ -24,8 +24,6 @@ buildPythonPackage rec {
     wheel
   ];
 
-  preCheck = "export PATH=$PATH:$out/bin";
-
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "ansi2html" ];

diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix
@@ -38,7 +38,6 @@ buildPythonPackage rec {
   ];
 
   preCheck = ''
-    export HOME=$(mktemp -d)
     substituteInPlace test/test_runtime.py \
       --replace-fail "printenv" "${coreutils}/bin/printenv"
   '';

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -62,8 +62,6 @@ buildPythonPackage rec {
   ];
 
   preCheck = ''
-    export HOME=$(mktemp -d)
-    export PATH="$PATH:$out/bin";
     # avoid coverage flags
     rm pytest.ini
   '';

diff --git a/pkgs/development/python-modules/ansible-vault-rw/default.nix b/pkgs/development/python-modules/ansible-vault-rw/default.nix
@@ -28,12 +28,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ansible-core ];
 
-  # Otherwise tests will fail to create directory
-  # Permission denied: '/homeless-shelter'
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   # no tests in sdist, no 2.1.0 tag on git
   doCheck = false;
 

diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
@@ -59,10 +59,6 @@ buildPythonPackage rec {
     pytest-cov-stub
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
-
   disabledTests = [
     # Tests require network access
     "test_bulk_search"

diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix
@@ -48,10 +48,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  preCheck = ''
-    export HOME=$TMP
-  '';
-
   pythonImportsCheck = [ "apptools" ];
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
@@ -122,10 +122,6 @@ buildPythonPackage rec {
     boto3
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   disabledTestPaths =
     [
       "tests/integration_tests"

diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix
@@ -169,10 +169,6 @@ buildPythonPackage rec {
   # Still quite a bit of optional dependencies missing
   doCheck = false;
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   nativeCheckInputs = [
     pytestCheckHook
     pytest-mock

diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix
@@ -52,10 +52,6 @@ buildPythonPackage rec {
     ];
   };
 
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
-
   nativeCheckInputs = [
     aria2
     fastapi

diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix
@@ -82,10 +82,6 @@ buildPythonPackage rec {
     zarr
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
-
   pytestFlagsArray = [ "arviz/tests/base_tests/" ];
 
   disabledTests = [

diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix
@@ -54,10 +54,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "asdf_astropy" ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   meta = with lib; {
     description = "Extension library for ASDF to provide support for Astropy";
     homepage = "https://github.com/astropy/asdf-astropy";

diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
@@ -74,10 +74,6 @@ buildPythonPackage rec {
     "test_fix_scaled" # Did not raise UserWarning
   ] ++ lib.optionals (pythonAtLeast "3.12") [ "test_info_calculators" ];
 
-  preCheck = ''
-    export PATH="$out/bin:$PATH"
-  '';
-
   pythonImportsCheck = [ "ase" ];
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix
@@ -32,7 +32,6 @@ buildPythonPackage rec {
 
   preCheck = ''
     export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell"
-    export HOME=$(mktemp -d)
   '';
 
   pytestFlagsArray = [ "test/unittests.py" ];

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
@@ -130,7 +130,6 @@ buildPythonPackage rec {
   # https://github.com/astropy/astropy/issues/15316#issuecomment-1722190547
   preCheck = ''
     cd "$out"
-    export HOME="$(mktemp -d)"
     export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 ))
   '';
 

diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix
@@ -71,7 +71,6 @@ buildPythonPackage rec {
   # Tests must be run in the build directory. The tests create files
   # in $HOME/.astropy so we need to set HOME to $TMPDIR.
   preCheck = ''
-    export HOME=$TMPDIR
     cd build/lib
   '';
 

diff --git a/pkgs/development/python-modules/async-dns/default.nix b/pkgs/development/python-modules/async-dns/default.nix
@@ -23,10 +23,13 @@ buildPythonPackage rec {
   nativeBuildInputs = [ poetry-core ];
 
   checkPhase = ''
-    export HOME=$TMPDIR
+    runHook preCheck
+
     # Test needs network access
     rm -r tests/resolver
     ${python.interpreter} -m unittest
+
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "async_dns" ];

diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix
@@ -47,11 +47,6 @@ buildPythonPackage rec {
   # an instance of aw-server running in order to function.
   pytestFlagsArray = [ "tests/test_requestqueue.py" ];
 
-  preCheck = ''
-    # Fake home folder for tests that write to $HOME
-    export HOME="$TMPDIR"
-  '';
-
   pythonImportsCheck = [ "aw_client" ];
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };

diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix
@@ -55,11 +55,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  preCheck = ''
-    # Fake home folder for tests that write to $HOME
-    export HOME="$TMPDIR"
-  '';
-
   pythonImportsCheck = [ "aw_core" ];
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };

diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -57,10 +57,6 @@ buildPythonPackage rec {
     toml
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
-
   pythonImportsCheck = [ "aws_adfs" ];
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix
@@ -50,10 +50,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   disabledTests =
     [
       # Tests require network access

diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
@@ -54,9 +54,12 @@ buildPythonPackage rec {
   doCheck = false;
 
   checkPhase = ''
+    runHook preCheck
+
     cd ../../examples
-    export HOME=$TEMPDIR
     ${python.interpreter} run_all.py
+
+    runHook postCheck
   '';
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix
@@ -49,10 +49,6 @@ buildPythonPackage rec {
     responses
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
-
   disabledTests = [
     # Tests are failing for various reasons (missing git repo, missing test data, etc.)
     "test_baseline_filters_out_known_secrets"

diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
@@ -62,7 +62,6 @@ buildPythonPackage rec {
   # the protoc-gen-python_betterproto script from the package to be on PATH.
   preCheck = ''
     (($(ulimit -n) < 1024)) && ulimit -n 1024
-    export PATH=$PATH:$out/bin
     patchShebangs src/betterproto/plugin/main.py
     ${python.interpreter} -m tests.generate
   '';

diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -66,7 +66,6 @@ buildPythonPackage rec {
 
   preCheck = ''
     export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo
-    export PATH=$out/bin:$PATH
   '';
 
   pythonImportsCheck = [ "bimmer_connected" ];

diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
@@ -34,7 +34,6 @@ buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
 
-    export HOME=$(mktemp -d)
     cd Tests
     python run_tests.py --offline
 

diff --git a/pkgs/development/python-modules/birch/default.nix b/pkgs/development/python-modules/birch/default.nix
@@ -54,10 +54,6 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  preCheck = ''
-    export HOME="$(mktemp -d)"
-  '';
-
   meta = with lib; {
     description = "Simple hierarchical configuration for Python packages";
     homepage = "https://github.com/shaypal5/birch";

diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
@@ -80,8 +80,6 @@ buildPythonPackage rec {
 
   preCheck =
     ''
-      export PATH="$PATH:$out/bin"
-
       # The top directory /build matches black's DEFAULT_EXCLUDE regex.
       # Make /build the project root for black tests to avoid excluding files.
       touch ../.git

diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix
@@ -34,10 +34,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   # Race condition, https://github.com/secdev/scapy/pull/4558
   # pythonImportsCheck = [ "bof" ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,8 +24,6 @@ buildPythonPackage rec { @@
         wheel
       ];
-      preCheck = "export PATH=$PATH:$out/bin";
       nativeCheckInputs = [ pytestCheckHook ];
       pythonImportsCheck = [ "ansi2html" ];
@@ Expand Down @@