commit 7c11adca921d83d5a6d63f1fa2f67f72d7bee42b · pyrox.dev/nixpkgs

+10 -8

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         argcomplete,

     

       4
       4
       +
         attrs,

     

       4
       5
        
         buildPythonPackage,

     

       5
       6
        
         colorlog,

     

       7
       7
       +
         dependency-groups,

     

       6
       8
        
         fetchFromGitHub,

     

       7
       9
        
         hatchling,

     

       8
       10
        
         jinja2,

     
···

       17
       19
        
       

     

       18
       20
        
       buildPythonPackage rec {

     

       19
       21
        
         pname = "nox";

     

       20
       20
       -
         version = "2024.10.09";

     

       22
       22
       +
         version = "2025.05.01";

     

       21
       23
        
         pyproject = true;

     

       22
       24
        
       

     

       23
       25
        
         disabled = pythonOlder "3.8";

     
···

       26
       28
        
           owner = "wntrblm";

     

       27
       29
        
           repo = "nox";

     

       28
       30
        
           tag = version;

     

       29
       29
       -
           hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";

     

       31
       31
       +
           hash = "sha256-qH8oh7tmiJkXOobyDZMRZ62w2sRHJF8sh4PX+6s7M70=";

     

       30
       32
        
         };

     

       31
       33
        
       

     

       32
       32
       -
         patches = [

     

       33
       33
       -
           # Backport of https://github.com/wntrblm/nox/pull/903, which can be removed on next release

     

       34
       34
       -
           ./fix-broken-mock-on-cpython-3.12.8.patch

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       34
        
         build-system = [ hatchling ];

     

       38
       35
        
       

     

       39
       36
        
         dependencies = [

     

       40
       37
        
           argcomplete

     

       38
       38
       +
           attrs

     

       41
       39
        
           colorlog

     

       40
       40
       +
           dependency-groups

     

       42
       41
        
           packaging

     

       43
       42
        
           virtualenv

     

       44
       43
        
         ]

     
···

       67
       66
        
           "test__create_venv_options"

     

       68
       67
        
           # Assertion errors

     

       69
       68
        
           "test_uv"

     

       69
       69
       +
           # calls to naked python

     

       70
       70
       +
           "test_noxfile_script_mode"

     

       71
       71
       +
           "test_noxfile_script_mode_url_req"

     

       70
       72
        
         ];

     

       71
       73
        
       

     

       72
       74
        
         disabledTestPaths = [

     
···

       77
       79
        
         meta = with lib; {

     

       78
       80
        
           description = "Flexible test automation for Python";

     

       79
       81
        
           homepage = "https://nox.thea.codes/";

     

       80
       80
       -
           changelog = "https://github.com/wntrblm/nox/blob/${version}/CHANGELOG.md";

     

       82
       82
       +
           changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md";

     

       81
       83
        
           license = licenses.asl20;

     

       82
       84
        
           maintainers = with maintainers; [

     

       83
       85
        
             doronbehar

-35

pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch

···

       1
       1
       -
       diff --git a/nox/command.py b/nox/command.py

     

       2
       2
       -
       index 671875c..4984168 100644

     

       3
       3
       -
       --- a/nox/command.py

     

       4
       4
       -
       +++ b/nox/command.py

     

       5
       5
       -
       @@ -30,6 +30,8 @@ TYPE_CHECKING = False

     

       6
       6
       -
        if TYPE_CHECKING:

     

       7
       7
       -
            from typing import IO

     

       8
       8
       -
        

     

       9
       9
       -
       +_PLATFORM = sys.platform

     

       10
       10
       -
       +

     

       11
       11
       -
        ExternalType = Literal["error", True, False]

     

       12
       12
       -
        

     

       13
       13
       -
        

     

       14
       14
       -
       @@ -63,7 +65,7 @@ def _clean_env(env: Mapping[str, str | None] | None = None) -> dict[str, str] |

     

       15
       15
       -
            clean_env = {k: v for k, v in env.items() if v is not None}

     

       16
       16
       -
        

     

       17
       17
       -
            # Ensure systemroot is passed down, otherwise Windows will explode.

     

       18
       18
       -
       -    if sys.platform == "win32":

     

       19
       19
       -
       +    if _PLATFORM.startswith("win"):

     

       20
       20
       -
                clean_env.setdefault("SYSTEMROOT", os.environ.get("SYSTEMROOT", ""))

     

       21
       21
       -
        

     

       22
       22
       -
            return clean_env

     

       23
       23
       -
       diff --git a/tests/test_command.py b/tests/test_command.py

     

       24
       24
       -
       index ae398e9..904cf34 100644

     

       25
       25
       -
       --- a/tests/test_command.py

     

       26
       26
       -
       +++ b/tests/test_command.py

     

       27
       27
       -
       @@ -157,7 +157,7 @@ def test_run_env_remove(monkeypatch):

     

       28
       28
       -
            )

     

       29
       29
       -
        

     

       30
       30
       -
        

     

       31
       31
       -
       -@mock.patch("sys.platform", "win32")

     

       32
       32
       -
       +@mock.patch("nox.command._PLATFORM", "win32")

     

       33
       33
       -
        def test_run_env_systemroot():

     

       34
       34
       -
            systemroot = os.environ.setdefault("SYSTEMROOT", "sigil")

     

       35
       35
       -