diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 481cd7287483..78777f18b4d8 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -8,11 +8,11 @@ hatchling, # dependencies + attrs, argcomplete, colorlog, + dependency-groups, jinja2, - packaging, - tomli, # tests pytestCheckHook, @@ -26,33 +26,26 @@ buildPythonPackage rec { pname = "nox"; - version = "2024.10.09"; + version = "2025.05.01"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "wntrblm"; repo = "nox"; tag = version; - hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8="; + hash = "sha256-qH8oh7tmiJkXOobyDZMRZ62w2sRHJF8sh4PX+6s7M70="; }; - patches = [ - # Backport of https://github.com/wntrblm/nox/pull/903, which can be removed on next release - ./fix-broken-mock-on-cpython-3.12.8.patch - ]; - build-system = [ hatchling ]; dependencies = [ + attrs argcomplete colorlog - packaging + dependency-groups virtualenv - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli ]; optional-dependencies = { @@ -71,10 +64,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "nox" ]; disabledTests = [ - # our conda is not available on 3.11 - "test__create_venv_options" # Assertion errors "test_uv" + # Test requires network access + "test_noxfile_script_mode_url_req" + # Don't test CLi mode + "test_noxfile_script_mode" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch b/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch deleted file mode 100644 index f634c3534b93..000000000000 --- a/pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/nox/command.py b/nox/command.py -index 671875c..4984168 100644 ---- a/nox/command.py -+++ b/nox/command.py -@@ -30,6 +30,8 @@ TYPE_CHECKING = False - if TYPE_CHECKING: - from typing import IO - -+_PLATFORM = sys.platform -+ - ExternalType = Literal["error", True, False] - - -@@ -63,7 +65,7 @@ def _clean_env(env: Mapping[str, str | None] | None = None) -> dict[str, str] | - clean_env = {k: v for k, v in env.items() if v is not None} - - # Ensure systemroot is passed down, otherwise Windows will explode. -- if sys.platform == "win32": -+ if _PLATFORM.startswith("win"): - clean_env.setdefault("SYSTEMROOT", os.environ.get("SYSTEMROOT", "")) - - return clean_env -diff --git a/tests/test_command.py b/tests/test_command.py -index ae398e9..904cf34 100644 ---- a/tests/test_command.py -+++ b/tests/test_command.py -@@ -157,7 +157,7 @@ def test_run_env_remove(monkeypatch): - ) - - --@mock.patch("sys.platform", "win32") -+@mock.patch("nox.command._PLATFORM", "win32") - def test_run_env_systemroot(): - systemroot = os.environ.setdefault("SYSTEMROOT", "sigil") -