Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Flask for openSUSE:Factory checked in at 2026-09-28 10:35:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Flask (Old) and /work/SRC/openSUSE:Factory/.python-Flask.new.383539 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Flask" Mon Sep 28 10:35:23 2026 rev:46 rq:1379929 version:3.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Flask/python-Flask.changes 2026-04-16 17:26:02.789151488 +0200 +++ /work/SRC/openSUSE:Factory/.python-Flask.new.383539/python-Flask.changes 2026-09-28 10:36:22.817639894 +0200 @@ -1,0 +2,6 @@ +Wed Sep 23 09:27:09 UTC 2026 - Steve Kowalik <[email protected]> + +- Add patch support-pytest-9.1.patch: + * Do not use private pytest monkeypatch fixture. + +------------------------------------------------------------------- New: ---- support-pytest-9.1.patch ----------(New B)---------- New: - Add patch support-pytest-9.1.patch: * Do not use private pytest monkeypatch fixture. ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Flask.spec ++++++ --- /var/tmp/diff_new_pack.z713m1/_old 2026-09-28 10:36:23.909685668 +0200 +++ /var/tmp/diff_new_pack.z713m1/_new 2026-09-28 10:36:23.912685794 +0200 @@ -31,6 +31,8 @@ URL: https://flask.palletsprojects.com Source0: https://files.pythonhosted.org/packages/source/f/flask/flask-%{version}.tar.gz Source1: python-Flask-rpmlintrc +# PATCH-FIX-UPSTREAM gh#pallets/flask#6095 +Patch0: support-pytest-9.1.patch BuildRequires: %{python_module Jinja2 >= 3.1.2} BuildRequires: %{python_module MarkupSafe} BuildRequires: %{python_module Werkzeug >= 3.1.0} ++++++ support-pytest-9.1.patch ++++++ >From 5ce121dd841e2dc2594d0ed3954278f4101d3521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> Date: Tue, 14 Jul 2026 12:07:37 +0200 Subject: [PATCH] Replace the use of private `monkeypatch` fixture API --- tests/conftest.py | 43 +++++++++++++------------------------------ tests/test_cli.py | 8 ++++---- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 214f520338..60bf5f4baf 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,43 +2,26 @@ import sys import pytest -from _pytest import monkeypatch from flask import Flask from flask.globals import request_ctx [email protected](scope="session", autouse=True) -def _standard_os_environ(): - """Set up ``os.environ`` at the start of the test session to have - standard values. Returns a list of operations that is used by - :func:`._reset_os_environ` after each test. - """ - mp = monkeypatch.MonkeyPatch() - out = ( - (os.environ, "FLASK_ENV_FILE", monkeypatch.notset), - (os.environ, "FLASK_APP", monkeypatch.notset), - (os.environ, "FLASK_DEBUG", monkeypatch.notset), - (os.environ, "FLASK_RUN_FROM_CLI", monkeypatch.notset), - (os.environ, "WERKZEUG_RUN_MAIN", monkeypatch.notset), - ) - - for _, key, value in out: - if value is monkeypatch.notset: - mp.delenv(key, False) - else: - mp.setenv(key, value) - - yield out - mp.undo() - - @pytest.fixture(autouse=True) -def _reset_os_environ(monkeypatch, _standard_os_environ): - """Reset ``os.environ`` to the standard environ after each test, - in case a test changed something without cleaning up. +def _standard_os_environ(monkeypatch): + """Set up ``os.environ`` at the start of every test to have + standard values. """ - monkeypatch._setitem.extend(_standard_os_environ) + for key in ( + "FLASK_ENV_FILE", + "FLASK_APP", + "FLASK_DEBUG", + "FLASK_RUN_FROM_CLI", + "WERKZEUG_RUN_MAIN", + ): + monkeypatch.delenv(key, False) + + yield @pytest.fixture diff --git a/tests/test_cli.py b/tests/test_cli.py index e254c1dd8e..79025dda7f 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -11,7 +11,6 @@ import click import pytest -from _pytest.monkeypatch import notset from click.testing import CliRunner from flask import Blueprint @@ -534,9 +533,8 @@ def dotenv_not_available(): @need_dotenv def test_load_dotenv(monkeypatch): - # can't use monkeypatch.delitem since the keys don't exist yet for item in ("FOO", "BAR", "SPAM", "HAM"): - monkeypatch._setitem.append((os.environ, item, notset)) + monkeypatch.delenv(item, False) monkeypatch.setenv("EGGS", "3") monkeypatch.chdir(test_path) @@ -559,7 +557,7 @@ def test_load_dotenv(monkeypatch): @need_dotenv def test_dotenv_path(monkeypatch): for item in ("FOO", "BAR", "EGGS"): - monkeypatch._setitem.append((os.environ, item, notset)) + monkeypatch.delenv(item, False) load_dotenv(test_path / ".flaskenv") assert Path.cwd() == cwd @@ -567,6 +565,7 @@ def test_dotenv_path(monkeypatch): def test_dotenv_optional(monkeypatch): + monkeypatch.delenv("FOO", False) monkeypatch.setitem(sys.modules, "dotenv", None) monkeypatch.chdir(test_path) load_dotenv() @@ -575,6 +574,7 @@ def test_dotenv_optional(monkeypatch): @need_dotenv def test_disable_dotenv_from_env(monkeypatch, runner): + monkeypatch.delenv("FOO", False) monkeypatch.chdir(test_path) monkeypatch.setitem(os.environ, "FLASK_SKIP_DOTENV", "1") runner.invoke(FlaskGroup())
