[rpms/python-conda-package-handling] rawhide: Update to 2.5.0 upstream release

[Orion Poplawski <orion@nwra.com>]

            A new commit has been pushed.

            Repo   : rpms/python-conda-package-handling
            Branch : rawhide
            Commit : 120782b5f817d4054e7518c48c87ba73ed2048c7
            Author : Orion Poplawski <orion@nwra.com>
            Date   : 2026-06-08T21:55:50-06:00
            Stats  : +7/-41 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-conda-package-handling/c/120782b5f817d4054e7518c48c87ba73ed2048c7?branch=rawhide

            Log:
            Update to 2.5.0 upstream release

- Resolves: rhbz#1948558

---
diff --git a/.gitignore b/.gitignore
index 92577a0..1b95d14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /conda-package-handling-2.2.0.tar.gz
 /conda-package-handling-2.3.0.tar.gz
 /conda-package-handling-2.4.0.tar.gz
+/conda-package-handling-2.5.0.tar.gz

diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..af5832b
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.16.0.

diff --git a/fix-pytest9-use-ini_options.patch b/fix-pytest9-use-ini_options.patch
deleted file mode 100644
index 1613a03..0000000
--- a/fix-pytest9-use-ini_options.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0c8e45c8b984dc085b003a74422a49d13d50e0b7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
-Date: Tue, 31 Mar 2026 16:50:10 +0200
-Subject: [PATCH] Fix pytest 9 compatibility: convert addopts to string
-
----
- pyproject.toml | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 2aac957..dcb5a9d 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -6,15 +6,7 @@ line-length = 99
- profile = "black"
- line_length = 99
- 
--[tool.pytest]
-+[tool.pytest.ini_options]
- norecursedirs = [".*", "*.egg*", "build", "dist", "conda.recipe"]
--addopts = [
--    "--junitxml=junit.xml",
--    "--ignore setup.py",
--    "--ignore run_test.py",
--    "--cov-report term-missing",
--    "--tb native",
--    "--strict-markers",
--    "--durations=20",
--]
-+addopts = "--junitxml=junit.xml --ignore setup.py --ignore run_test.py --tb native --strict-markers --durations=20"
- markers = ["serial: execute test serially (to avoid race conditions)"]
--- 
-2.53.0
-

diff --git a/python-conda-package-handling.spec b/python-conda-package-handling.spec
index f19cb7c..1eaab3a 100644
--- a/python-conda-package-handling.spec
+++ b/python-conda-package-handling.spec
@@ -3,16 +3,13 @@
 %global pkgname conda_package_handling
 
 Name:           python-%{srcname}
-Version:        2.4.0
+Version:        2.5.0
 Release:        %autorelease
 Summary:        Create and extract conda packages of various formats
 
 License:        BSD-3-Clause
 URL:            https://github.com/conda/%{srcname}
 Source0:        https://github.com/conda/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
-# Fix pytest 9: addopts list elements are treated as single CLI args
-# Backport of https://github.com/conda/conda-package-handling/pull/310
-Patch:          fix-pytest9-use-ini_options.patch
 
 BuildArch:      noarch
 
@@ -31,9 +28,8 @@ Create and extract conda packages of various formats.
 
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
-sed -i -e s/archive_and_deps/archive/ setup.py
 # do not run coverage in pytest
-sed -i -E '/--(no-)?cov/d' setup.cfg
+sed -i -E '/--(no-)?cov/d' pyproject.toml
 
 %generate_buildrequires
 %pyproject_buildrequires

diff --git a/sources b/sources
index 6c3fdcd..f10eb6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conda-package-handling-2.4.0.tar.gz) = da690b4ebd76aae8b4de86a443af7d9029c7c5c12c4e0a811f2a9a17481b8f9a1f37f3d7c3bf857171c529ec25b88814342afb023ed75b734c65ac08e33fe067
+SHA512 (conda-package-handling-2.5.0.tar.gz) = 6f7f42ec1a7868dc28f90f8183142c4266f2dcf5ef5d0b38b6191d94c86af188d50aeaa8213f2b668dbf9ce65fa479d31ef8acaf4ff54605937d4008cb787cbe