python/python-nox
SHA256
15
0
Fork 0
forked from pool/python-nox
Code Pull Requests Activity

Accepting request 1232725 from devel:languages:python

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1232725
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-nox?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger
2024-12-20 14:27:28 +00:00
committed by Git OBS Bridge
parent f7013734a3 82be1e6156
commit 370a1e9e23
3 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fix-broken-mock-test.patch Normal file
View File

@@ -0,0 +1,46 @@
From 28bbaa5a17ed1ac39be63b1ecd9bd7e187a7db2e Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Thu, 12 Dec 2024 21:44:02 -0500
Subject: [PATCH] tests: fix broken mock on CPython 3.12.8+ (#903)
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
---
nox/command.py | 4 +++-
tests/test_command.py | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
Index: nox-2024.04.15/nox/command.py
===================================================================
--- nox-2024.04.15.orig/nox/command.py
+++ nox-2024.04.15/nox/command.py
@@ -36,6 +36,8 @@ if TYPE_CHECKING:
ExternalType = Literal["error", True, False]
+_PLATFORM = sys.platform
+
class CommandFailed(Exception):
"""Raised when an executed command returns a non-success status code."""
@@ -67,7 +69,7 @@ def _clean_env(env: Mapping[str, str | N
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
Index: nox-2024.04.15/tests/test_command.py
===================================================================
--- nox-2024.04.15.orig/tests/test_command.py
+++ nox-2024.04.15/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")

6
python-nox.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 19 15:26:17 UTC 2024 - Nico Krapp <nico.krapp@suse.com>
- Add missing requirements
- Add fix-broken-mock-test.patch to fix testsuite
-------------------------------------------------------------------
Wed Oct 23 20:29:29 UTC 2024 - Dirk Müller <dmueller@suse.com>

6
python-nox.spec
View File

@@ -25,7 +25,9 @@ Summary: Flexible test automation
License: Apache-2.0
URL: https://nox.thea.codes
Source: https://github.com/wntrblm/nox/archive/refs/tags/%{padded_version}.tar.gz#/nox-%{version}.tar.gz
BuildRequires: %{python_module base >= 3.5}
# PATCH-FIX-UPSTREAM fix-broken-mock-test.patch (gh#28bbaa5)
Patch0: fix-broken-mock-test.patch
BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module hatchling}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module wheel}
@@ -34,8 +36,8 @@ BuildRequires: git-core
BuildRequires: python-rpm-macros
Requires: python-argcomplete >= 1.9.4
Requires: python-colorlog >= 2.6.1
Requires: python-setuptools
Requires: python-virtualenv >= 14.0.0
Requires: (python-tomli if python-base < 3.11)
Requires(post): update-alternatives
Requires(postun): update-alternatives
Suggests: python-Jinja2