[rpms/fedpkg] 1.48-1: A few patches:

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : f9f53f99a384e8df950d856b66327c4dcee7dd14
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2025-02-18T02:29:14+00:00
            Stats  : +173/-1 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/f9f53f99a384e8df950d856b66327c4dcee7dd14?branch=1.48-1

            Log:
            A few patches:

- `releases-info` should always show the same order
- Python 3.13 environment and renew testing image
- Fix unittests when building for ELN target

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/0035-releases-info-should-always-show-the-same-order.patch b/0035-releases-info-should-always-show-the-same-order.patch
new file mode 100644
index 0000000..a601452
--- /dev/null
+++ b/0035-releases-info-should-always-show-the-same-order.patch
@@ -0,0 +1,32 @@
+From d8f18b789de07a375bc63787ee1964cb16f0aa1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
+Date: Wed, 22 Jan 2025 04:36:16 +0100
+Subject: [PATCH 1/3] `releases-info` should always show the same order
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes: #569
+JIRA: RHELCMP-14101
+
+Signed-off-by: Ondřej Nosek <onosek@redhat.com>
+---
+ fedpkg/utils.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fedpkg/utils.py b/fedpkg/utils.py
+index dbee142..4595c44 100644
+--- a/fedpkg/utils.py
++++ b/fedpkg/utils.py
+@@ -257,7 +257,7 @@ def get_release_branches(server_url):
+         short_name = "fedora" if product_version.startswith("f") else "epel"
+         releases.setdefault(short_name, set()).add(product_version)
+ 
+-    return {key: list(value) for key, value in releases.items()}
++    return {key: sorted(list(value)) for key, value in releases.items()}
+ 
+ 
+ def sl_list_to_dict(sls):
+-- 
+2.48.1
+

diff --git a/0036-Python-3.13-environment-and-renew-testing-image.patch b/0036-Python-3.13-environment-and-renew-testing-image.patch
new file mode 100644
index 0000000..15267d0
--- /dev/null
+++ b/0036-Python-3.13-environment-and-renew-testing-image.patch
@@ -0,0 +1,75 @@
+From 1603cdac055fbf2166c332fd46e8293fe1323584 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
+Date: Wed, 29 Jan 2025 03:30:49 +0100
+Subject: [PATCH 2/3] Python 3.13 environment and renew testing image
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+JIRA: RHELCMP-14330
+
+Signed-off-by: Ondřej Nosek <onosek@redhat.com>
+---
+ README.rst              | 2 +-
+ jenkins_test.dockerfile | 3 ++-
+ pyproject.toml          | 1 +
+ setup.py                | 1 +
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/README.rst b/README.rst
+index 7af6c69..f25b0f5 100644
+--- a/README.rst
++++ b/README.rst
+@@ -3,7 +3,7 @@ Introduction
+ 
+ This is the fedpkg project, which mostly is a subclass of the rpkg project.
+ 
+-fedpkg works with Python 3.6, 3.9, 3.12
++fedpkg works with Python 3.6, 3.9, 3.12 and 3.13
+ 
+ License
+ =======
+diff --git a/jenkins_test.dockerfile b/jenkins_test.dockerfile
+index b4a2af8..f848fd2 100644
+--- a/jenkins_test.dockerfile
++++ b/jenkins_test.dockerfile
+@@ -1,4 +1,4 @@
+-FROM fedora:39
++FROM fedora:41
+ LABEL \
+     name="fedpkg test" \
+     description="Run tests using tox with Python 3" \
+@@ -9,6 +9,7 @@ RUN dnf -y update && dnf -y install \
+         python3-setuptools \
+         rpm-build \
+         python3-tox \
++        python3.6 \
+         gcc \
+         libcurl-devel \
+         krb5-devel \
+diff --git a/pyproject.toml b/pyproject.toml
+index fdc00ad..32fe550 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -20,6 +20,7 @@ classifiers = [
+     "Programming Language :: Python :: 3.6",
+     "Programming Language :: Python :: 3.9",
+     "Programming Language :: Python :: 3.12",
++    "Programming Language :: Python :: 3.13",
+     "Topic :: Software Development :: Build Tools",
+ ]
+ dependencies = [
+diff --git a/setup.py b/setup.py
+index fbe34d7..ea8a8e1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -67,5 +67,6 @@ setup(
+         'Programming Language :: Python :: 3.6',
+         'Programming Language :: Python :: 3.9',
+         'Programming Language :: Python :: 3.12',
++        'Programming Language :: Python :: 3.13',
+     ],
+ )
+-- 
+2.48.1
+

diff --git a/0037-Fix-unittests-when-building-for-ELN-target.patch b/0037-Fix-unittests-when-building-for-ELN-target.patch
new file mode 100644
index 0000000..2064d0f
--- /dev/null
+++ b/0037-Fix-unittests-when-building-for-ELN-target.patch
@@ -0,0 +1,57 @@
+From 215c7add2f131c011fcdf19aa097f460a512e129 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
+Date: Tue, 18 Feb 2025 01:25:08 +0100
+Subject: [PATCH 3/3] Fix unittests when building for ELN target
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+JIRA: RHELCMP-14347
+Fixes: #589
+
+Signed-off-by: Ondřej Nosek <onosek@redhat.com>
+---
+ test/test_cli.py      | 3 ++-
+ test/test_commands.py | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_cli.py b/test/test_cli.py
+index d201e7f..f002f65 100644
+--- a/test/test_cli.py
++++ b/test/test_cli.py
+@@ -2270,13 +2270,14 @@ class TestBuildFromStreamBranch(CliTestCase):
+ 
+         _build.assert_called_once_with(None)
+ 
++    @patch('distro.os_release_info', return_value={'variant': 'non-ELN'})
+     @patch('pyrpkg.cli.cliClient._build')
+     @patch('fedpkg.Commands.build_target')
+     @patch('fedpkg.cli.get_stream_branches')
+     @patch('fedpkg.cli.get_release_branches')
+     def test_submit_builds(
+             self, get_release_branches, get_stream_branches, build_target,
+-            _build):
++            _build, os_release_info):
+         get_release_branches.return_value = {
+             'fedora': ['f28', 'f27'],
+             'epel': ['epel7', 'epel8', 'epel9'],
+diff --git a/test/test_commands.py b/test/test_commands.py
+index b08a7fe..a168335 100644
+--- a/test/test_commands.py
++++ b/test/test_commands.py
+@@ -23,10 +23,11 @@ class TestDetermineRuntimeEnv(CommandTestCase):
+         super(TestDetermineRuntimeEnv, self).setUp()
+         self.cmd = self.make_commands()
+ 
++    @patch('distro.os_release_info', return_value={'variant': 'non-ELN'})
+     @patch('distro.id', return_value='fedora')
+     @patch('distro.like', return_value='')
+     @patch('distro.major_version', return_value='25')
+-    def test_return_fedora_disttag(self, mock_ver, mock_like, mock_id):
++    def test_return_fedora_disttag(self, mock_ver, mock_like, mock_id, mock_release_info):
+         result = self.cmd._determine_runtime_env()
+         self.assertEqual('fc25', result)
+ 
+-- 
+2.48.1
+

diff --git a/fedpkg.spec b/fedpkg.spec
index 0ea7b44..33ea85c 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.45
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
@@ -48,6 +48,9 @@ Patch31:        0031-Add-setuptools-to-dependencies-for-Python-3.12.patch
 Patch32:        0032-Update-expired-token-exception-instructions.patch
 Patch33:        0033-Clone-epel10-branches-with-clone-B.patch
 Patch34:        0034-Update-expired-token-exception-instructions.patch
+Patch35:        0035-releases-info-should-always-show-the-same-order.patch
+Patch36:        0036-Python-3.13-environment-and-renew-testing-image.patch
+Patch37:        0037-Fix-unittests-when-building-for-ELN-target.patch
 
 BuildRequires:  pkgconfig
 BuildRequires:  bash-completion
@@ -130,6 +133,11 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 
 
 %changelog
+* Tue Feb 18 2025 Ondřej Nosek <onosek@redhat.com> - 1.45-9
+- `releases-info` should always show the same order
+- Python 3.13 environment and renew testing image
+- Fix unittests when building for ELN target
+
 * Mon Feb 17 2025 Ondřej Nosek <onosek@redhat.com> - 1.45-8
 - Patch: Update expired token exception instructions