Skip to content

Commit

Permalink
python312Packages.nox: apply backport for wntrblm/nox#903 (#365251)
Browse files Browse the repository at this point in the history
  • Loading branch information
kirillrdy authored Dec 15, 2024
2 parents 5995859 + 1d42315 commit 1879ba3
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/nox/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ buildPythonPackage rec {
hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";
};

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 =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
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")

0 comments on commit 1879ba3

Please sign in to comment.