From 7c11adca921d83d5a6d63f1fa2f67f72d7bee42b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Aug 2025 04:41:41 +0200 Subject: [PATCH] python3Packages.nox: 2024.10.09 -> 2025.05.01 https://github.com/wntrblm/nox/blob/2025.05.01/CHANGELOG.md This commit was automatically generated using update-python-libraries. --- .../python-modules/nox/default.nix | 18 +++++----- .../fix-broken-mock-on-cpython-3.12.8.patch | 35 ------------------- 2 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/nox/fix-broken-mock-on-cpython-3.12.8.patch diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index 91e23202c525..f419359780c6 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -1,8 +1,10 @@ { lib, argcomplete, + attrs, buildPythonPackage, colorlog, + dependency-groups, fetchFromGitHub, hatchling, jinja2, @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "nox"; - version = "2024.10.09"; + version = "2025.05.01"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,19 +28,16 @@ buildPythonPackage rec { 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 = [ argcomplete + attrs colorlog + dependency-groups packaging virtualenv ] @@ -67,6 +66,9 @@ buildPythonPackage rec { "test__create_venv_options" # Assertion errors "test_uv" + # calls to naked python + "test_noxfile_script_mode" + "test_noxfile_script_mode_url_req" ]; disabledTestPaths = [ @@ -77,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flexible test automation for Python"; homepage = "https://nox.thea.codes/"; - changelog = "https://github.com/wntrblm/nox/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/wntrblm/nox/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar 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") -