public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Maxwell G <maxwell@gtmx.me>
To: git-commits@fedoraproject.org
Subject: [rpms/ansible-builder] rawhide: Fix build failure caused by pytest deprecation (rhbz#2485686)
Date: Sun, 07 Jun 2026 04:22:06 GMT	[thread overview]
Message-ID: <178080612607.1.2893497894070808760.rpms-ansible-builder-d6b600ad2796@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/ansible-builder
            Branch : rawhide
            Commit : d6b600ad27965dcf8ef1e68d61347aab6c8e11d4
            Author : Maxwell G <maxwell@gtmx.me>
            Date   : 2026-06-06T23:21:22-05:00
            Stats  : +30/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ansible-builder/c/d6b600ad27965dcf8ef1e68d61347aab6c8e11d4?branch=rawhide

            Log:
            Fix build failure caused by pytest deprecation (rhbz#2485686)

[skip changelog]

---
diff --git a/0001-Fix-incorrect-pytest-mark-fixture-usage.patch b/0001-Fix-incorrect-pytest-mark-fixture-usage.patch
new file mode 100644
index 0000000..e9b2801
--- /dev/null
+++ b/0001-Fix-incorrect-pytest-mark-fixture-usage.patch
@@ -0,0 +1,28 @@
+From 578d5fa93e659cc15a146e89eb8b600d94b55132 Mon Sep 17 00:00:00 2001
+From: Maxwell G <maxwell@gtmx.me>
+Date: Sat, 6 Jun 2026 23:15:27 -0500
+Subject: [PATCH] Fix incorrect pytest mark + fixture usage
+
+Fixed upstream in
+https://github.com/ansible/ansible-builder/commit/8379a35a274c1df0beaf781c49f708f1378f2a70.
+
+Ref: https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function
+---
+ test/conftest.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/test/conftest.py b/test/conftest.py
+index ec4ad77..0b3b149 100644
+--- a/test/conftest.py
++++ b/test/conftest.py
+@@ -270,7 +270,6 @@ def podman_ee_tag(request):
+ 
+ 
+ @pytest.fixture
+-@pytest.mark.test_all_runtimes
+ def ee_tag(request, runtime):
+     image_name = gen_image_name(request)
+     WORKER_IMAGES.setdefault(runtime, [])
+-- 
+2.54.0
+

diff --git a/ansible-builder.spec b/ansible-builder.spec
index a0afbb7..c85f70d 100644
--- a/ansible-builder.spec
+++ b/ansible-builder.spec
@@ -9,6 +9,8 @@ License:        Apache-2.0
 URL:            https://ansible.readthedocs.io/projects/builder/en/stable/
 Source:         %{pypi_source ansible_builder}
 
+Patch:          0001-Fix-incorrect-pytest-mark-fixture-usage.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python3-devel

                 reply	other threads:[~2026-06-07  4:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178080612607.1.2893497894070808760.rpms-ansible-builder-d6b600ad2796@fedoraproject.org \
    --to=maxwell@gtmx.me \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox