[rpms/fedpkg] epel9: New release 1.48

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : epel9
            Commit : 28b1f9696ae2eaff20b4582aa83a717113b84f4e
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2026-07-31T04:00:18+00:00
            Stats  : +40/-418 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/28b1f9696ae2eaff20b4582aa83a717113b84f4e?branch=epel9

            Log:
            New release 1.48

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

---
diff --git a/.gitignore b/.gitignore
index 77c45e9..4f04bbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
 /fedpkg-1.45.tar.gz
 /fedpkg-1.46.tar.gz
 /fedpkg-1.47.tar.gz
+/fedpkg-1.48.tar.gz

diff --git a/0001-request-unretirement-fix-unittests.patch b/0001-request-unretirement-fix-unittests.patch
deleted file mode 100644
index 7ea3103..0000000
--- a/0001-request-unretirement-fix-unittests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 452024234ee0722e5a062af37b9ce8a3c2232986 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Wed, 26 Nov 2025 06:27:05 +0100
-Subject: [PATCH] `request-unretirement`: fix unittests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Relates: https://pagure.io/fedpkg/pull-request/558
-
-JIRA: RHELCMP-14989
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- test/test_cli.py | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/test/test_cli.py b/test/test_cli.py
-index 2103a46..155151b 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -2614,7 +2614,8 @@ class TestRequestUnretirement(CliTestCase):
- 
-         self.run_cmd(['git', 'checkout', '-b', 'f40'], cwd=self.cloned_repo_path)
- 
--        cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path, 'request-unretirement']
-+        cli_cmd = ['fedpkg-stage', '--path', self.cloned_repo_path, '--user', 'root',
-+                   'request-unretirement']
- 
-         cli = self.get_cli(cli_cmd)
-         cli.request_unretirement()
-@@ -2729,8 +2730,8 @@ class TestRequestUnretirement(CliTestCase):
-         self.run_cmd(['git', 'checkout', '-b', 'f40'], cwd=self.cloned_repo_path)
- 
-         cli_cmd = [
--            'fedpkg-stage', '--path', self.cloned_repo_path, 'request-unretirement',
--            '--bz_bug_id', '1234567']
-+            'fedpkg-stage', '--path', self.cloned_repo_path, '--user', 'root',
-+            'request-unretirement', '--bz_bug_id', '1234567']
- 
-         cli = self.get_cli(cli_cmd)
-         cli.request_unretirement()
-@@ -2778,7 +2779,8 @@ class TestRequestUnretirement(CliTestCase):
-         self.run_cmd(['git', 'checkout', '-b', 'f40'], cwd=self.cloned_repo_path)
- 
-         cli_cmd = [
--            'fedpkg-stage', '--path', self.cloned_repo_path, 'request-unretirement',
-+            'fedpkg-stage', '--path', self.cloned_repo_path, '--user', 'root',
-+            'request-unretirement',
-             '--bz_bug_id', 'https://bugzilla.redhat.com/show_bug.cgi?id=1234567']
- 
-         cli = self.get_cli(cli_cmd)
-@@ -2825,8 +2827,8 @@ class TestRequestUnretirement(CliTestCase):
- 
-         self.run_cmd(['git', 'checkout', '-b', 'f40'], cwd=self.cloned_repo_path)
-         cli_cmd = [
--            'fedpkg-stage', '--path', self.cloned_repo_path, 'request-unretirement',
--            '--repo', 'belusha'
-+            'fedpkg-stage', '--path', self.cloned_repo_path, '--user', 'root',
-+            'request-unretirement', '--repo', 'belusha'
-         ]
-         cli = self.get_cli(cli_cmd)
-         cli.request_unretirement()
--- 
-2.51.1
-

diff --git a/0002-Check-the-correct-sorting-of-imports-from-now-on.patch b/0002-Check-the-correct-sorting-of-imports-from-now-on.patch
deleted file mode 100644
index 3c7fe18..0000000
--- a/0002-Check-the-correct-sorting-of-imports-from-now-on.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-From d922f4fc1fe8c19c84147e19bd918feccc815d52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Mon, 1 Dec 2025 15:13:11 +0100
-Subject: [PATCH] Check the correct sorting of imports from now on
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Enabled ruff plugin for checking import order and fixed wrong lines.
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- doc/fedpkg_man_page.py |  1 -
- doc/source/conf.py     |  1 +
- fedpkg/__init__.py     | 12 ++++++------
- fedpkg/__main__.py     |  7 +++----
- fedpkg/bodhi_6.py      |  2 +-
- fedpkg/bugzilla.py     |  1 -
- fedpkg/cli.py          | 36 ++++++++++++++++++++++++------------
- fedpkg/utils.py        |  6 +++---
- pyproject.toml         |  2 +-
- setup.py               |  1 -
- test/test_bugzilla.py  |  3 ++-
- test/test_cli.py       |  7 ++++---
- test/test_retire.py    |  2 +-
- test/test_utils.py     |  8 ++++----
- test/utils.py          |  4 +++-
- 15 files changed, 53 insertions(+), 40 deletions(-)
-
-diff --git a/doc/fedpkg_man_page.py b/doc/fedpkg_man_page.py
-index 58e4d40..be4fd8a 100755
---- a/doc/fedpkg_man_page.py
-+++ b/doc/fedpkg_man_page.py
-@@ -3,7 +3,6 @@
- 
- import os
- import sys
--
- from configparser import ConfigParser
- 
- if __name__ == '__main__':
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 597fc83..d85d741 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -13,6 +13,7 @@
- # documentation root, use os.path.abspath to make it absolute, like shown here.
- #
- import datetime
-+
- # import os
- # import sys
- # sys.path.insert(0, os.path.abspath('.'))
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index ce21c90..70da587 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -9,25 +9,25 @@
- # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
- # the full text of the license.
- 
--import pyrpkg
- import os
--import git
- import re
--
- from datetime import datetime, timedelta, timezone
- 
-+import git
-+import pyrpkg
-+
- # doc/fedpkg_man_page.py uses the 'cli' import
- from . import cli  # noqa
- 
- try:
--    from .bodhi_6 import BodhiClient, UPDATE_TYPES, REQUEST_TYPES, SUGGEST_TYPES
-+    from .bodhi_6 import REQUEST_TYPES, SUGGEST_TYPES, UPDATE_TYPES, BodhiClient
- except ImportError:
-     # working bodhi-client is not available for el8 (Python3.6)
-     BodhiClient = None
--from .lookaside import FedoraLookasideCache
-+import distro
- from pyrpkg.utils import cached_property
- 
--import distro
-+from .lookaside import FedoraLookasideCache
- 
- 
- class Commands(pyrpkg.Commands):
-diff --git a/fedpkg/__main__.py b/fedpkg/__main__.py
-index fdc9c01..c100f2b 100644
---- a/fedpkg/__main__.py
-+++ b/fedpkg/__main__.py
-@@ -14,14 +14,13 @@
- import logging
- import os
- import sys
-+from configparser import ConfigParser
- 
--import fedpkg
--import fedpkg.utils
- import pyrpkg
- import pyrpkg.utils
- 
--from configparser import ConfigParser
--
-+import fedpkg
-+import fedpkg.utils
- 
- cli_name = os.path.basename(sys.argv[0])
- 
-diff --git a/fedpkg/bodhi_6.py b/fedpkg/bodhi_6.py
-index 415e3d2..ffa6268 100644
---- a/fedpkg/bodhi_6.py
-+++ b/fedpkg/bodhi_6.py
-@@ -10,7 +10,7 @@
- # the full text of the license.
- 
- from bodhi.client.bindings import BodhiClient as BodhiClient_
--from bodhi.client.constants import UPDATE_TYPES, REQUEST_TYPES, SUGGEST_TYPES  # noqa
-+from bodhi.client.constants import REQUEST_TYPES, SUGGEST_TYPES, UPDATE_TYPES  # noqa
- 
- 
- class BodhiClient(BodhiClient_):
-diff --git a/fedpkg/bugzilla.py b/fedpkg/bugzilla.py
-index 9305572..38207b3 100644
---- a/fedpkg/bugzilla.py
-+++ b/fedpkg/bugzilla.py
-@@ -16,7 +16,6 @@ from __future__ import absolute_import
- from datetime import datetime, timezone
- 
- import bugzilla
--
- from pyrpkg import rpkgError
- 
- 
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index e612155..3536d2e 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -22,7 +22,6 @@ import shutil
- import textwrap
- from datetime import datetime
- 
--
- # Use deprecated pkg_resources if importlib isn't available (python 3.6)
- try:
-     from importlib.metadata import distribution
-@@ -33,21 +32,34 @@ try:
-     from packaging.version import parse as parse_version
- except ImportError:
-     from pkg_resources import parse_version
--from pyrpkg import rpkgError
--from pyrpkg.cli import cliClient
- import configparser
- from urllib.parse import urlparse
- 
-+from pyrpkg import rpkgError
-+from pyrpkg.cli import cliClient
-+
- from fedpkg.bugzilla import BugzillaClient
--from fedpkg.completers import (build_arches, distgit_branches, fedpkg_packages,
--                               list_targets)
--from fedpkg.utils import (assert_new_tests_repo, assert_valid_epel_package,
--                          config_get_safely, disable_monitoring, do_add_remote,
--                          do_fork, expand_release, get_dist_git_url,
--                          get_fedora_release_state, get_pagure_branches,
--                          get_release_branches, get_stream_branches, is_epel,
--                          new_pagure_issue, sl_list_to_dict, verify_sls,
--                          does_package_exist_in_anitya, get_last_commit_date)
-+from fedpkg.completers import build_arches, distgit_branches, fedpkg_packages, list_targets
-+from fedpkg.utils import (
-+    assert_new_tests_repo,
-+    assert_valid_epel_package,
-+    config_get_safely,
-+    disable_monitoring,
-+    do_add_remote,
-+    do_fork,
-+    does_package_exist_in_anitya,
-+    expand_release,
-+    get_dist_git_url,
-+    get_fedora_release_state,
-+    get_last_commit_date,
-+    get_pagure_branches,
-+    get_release_branches,
-+    get_stream_branches,
-+    is_epel,
-+    new_pagure_issue,
-+    sl_list_to_dict,
-+    verify_sls,
-+)
- 
- RELEASE_BRANCH_REGEX = r'^(f\d+|el\d+|eln|epel\d+|epel\d+\.\d+)$'
- BUGZILLA_URL_REGEX = r"https:\/\/bugzilla\.redhat\.com\/show_bug\.cgi\?id=(\d{7})"
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index 232ebea..9ca4985 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -12,15 +12,15 @@
- 
- import json
- import re
--from datetime import datetime, timezone
- import tempfile
-+from configparser import NoOptionError, NoSectionError
-+from datetime import datetime, timezone
-+from urllib.parse import urlparse
- 
- import git
- import requests
- from pyrpkg import rpkgError
- from requests.exceptions import ConnectionError
--from configparser import NoOptionError, NoSectionError
--from urllib.parse import urlparse
- 
- 
- def query_bodhi(server_url, timeout=60):
-diff --git a/pyproject.toml b/pyproject.toml
-index ff12656..8f2c7c0 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -103,7 +103,7 @@ select = [
-     # flake8-simplify
-     #"SIM",
-     # isort
--    #"I",
-+    "I",
-     # flake8-bandit
-     "S",
-     # flake8-type-checking
-diff --git a/setup.py b/setup.py
-index bd3de2b..8048774 100755
---- a/setup.py
-+++ b/setup.py
-@@ -4,7 +4,6 @@ import os
- 
- from setuptools import find_packages, setup
- 
--
- project_dir = os.path.dirname(os.path.realpath(__file__))
- requirements = os.path.join(project_dir, 'requirements.txt')
- tests_requirements = os.path.join(project_dir, 'tests-requirements.txt')
-diff --git a/test/test_bugzilla.py b/test/test_bugzilla.py
-index c0a8b02..dfbe943 100644
---- a/test/test_bugzilla.py
-+++ b/test/test_bugzilla.py
-@@ -13,9 +13,10 @@
- import unittest
- from unittest.mock import Mock, patch
- 
--from fedpkg.bugzilla import BugzillaClient
- from pyrpkg import rpkgError
- 
-+from fedpkg.bugzilla import BugzillaClient
-+
- 
- class BugzillaSideEffect(object):
-     def __init__(self):
-diff --git a/test/test_cli.py b/test/test_cli.py
-index 155151b..a1aae35 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -36,13 +36,14 @@ try:
- except ImportError:
-     from pkg_resources import get_distribution as distribution
- 
--import fedpkg.cli
--from fedpkg.bugzilla import BugzillaClient
--from fedpkg.cli import check_bodhi_version
- from freezegun import freeze_time
- from pyrpkg.errors import rpkgError
- from utils import CliTestCase
- 
-+import fedpkg.cli
-+from fedpkg.bugzilla import BugzillaClient
-+from fedpkg.cli import check_bodhi_version
-+
- try:
-     import bodhi
-     bodhi_version = distribution('bodhi-client').version
-diff --git a/test/test_retire.py b/test/test_retire.py
-index e6f371e..aa6db69 100644
---- a/test/test_retire.py
-+++ b/test/test_retire.py
-@@ -5,7 +5,7 @@ import os
- import shutil
- import subprocess
- import tempfile
--from unittest import mock, TestCase
-+from unittest import TestCase, mock
- 
- from pyrpkg.errors import rpkgError
- 
-diff --git a/test/test_utils.py b/test/test_utils.py
-index ddb0e3d..498a572 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -10,18 +10,18 @@
- # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
- # the full text of the license.
- 
--from configparser import NoOptionError, NoSectionError
- import json
- import unittest
-+from configparser import NoOptionError, NoSectionError
- from unittest.mock import Mock, patch
- 
- import git
-+import requests
-+from freezegun import freeze_time
-+from pyrpkg.errors import rpkgError
- from requests.exceptions import ConnectionError
- 
- from fedpkg import utils
--from freezegun import freeze_time
--from pyrpkg.errors import rpkgError
--import requests
- 
- 
- class TestUtils(unittest.TestCase):
-diff --git a/test/utils.py b/test/utils.py
-index f4e71f3..36d4f3a 100644
---- a/test/utils.py
-+++ b/test/utils.py
-@@ -17,8 +17,10 @@ import shutil
- import subprocess
- import tempfile
- import unittest
--import fedpkg.cli
-+
- import pyrpkg
-+
-+import fedpkg.cli
- from fedpkg import Commands
- 
- 
--- 
-2.53.0
-

diff --git a/fedpkg.spec b/fedpkg.spec
index ddbc17f..d0fbb71 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -6,14 +6,14 @@
 %endif
 
 Name:           fedpkg
-Version:        1.47
-Release:        7%{?dist}
+Version:        1.48
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
 License:        GPL-2.0-or-later
-URL:            https://pagure.io/fedpkg
-Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.gz
+URL:            https://forge.fedoraproject.org/packaging/fedpkg
+Source0:        https://forge.fedoraproject.org/packaging/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -29,7 +29,7 @@ Requires:       redhat-rpm-config
 %global __python %{__python3}
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpkg >= 1.69-2
+BuildRequires:  python3-rpkg >= 1.70-1
 BuildRequires:  python3-distro
 %if 0%{?with_hatchling}
 BuildRequires:  pyproject-rpm-macros
@@ -45,7 +45,7 @@ BuildRequires:  python3-bodhi-client
 
 
 Requires:       python3-bugzilla
-Requires:       python3-rpkg >= 1.69-2
+Requires:       python3-rpkg >= 1.70-1
 Requires:       python3-distro
 Requires:       python3-openidc-client >= 0.6.0
 Requires:       python3-bodhi-client
@@ -55,9 +55,6 @@ Requires:       python3-setuptools
 Recommends:     fedora-packager
 Recommends:     fedpkg-completion
 
-Patch0:         0001-request-unretirement-fix-unittests.patch
-Patch1:         0002-Check-the-correct-sorting-of-imports-from-now-on.patch
-
 %description
 Provides the fedpkg command for working with dist-git
 
@@ -73,7 +70,7 @@ Summary:        The command-line completion support for fedpkg based on python-a
 Requires:       %{name} = %{version}-%{release}
 
 %description    -n fedpkg-completion
-This subpackage provides the command-line completion for the fedpkg CLI
+This sub-package provides the command-line completion for the fedpkg CLI
 via the python-argcomplete framework.
 
 %prep
@@ -115,7 +112,7 @@ register-python-argcomplete --shell zsh fedpkg > fedpkg.zsh
 %if 0%{?rhel} != 9
 %{__install} -D -p -m 0644 fedpkg.zsh %{buildroot}%{zsh_completions_dir}/_fedpkg
 %endif
-# config file /etc/rpkg/fedpkg.conf is extracted to %{buildroot}/usr/etc/... by pyproject_install
+# config file /etc/rpkg/fedpkg.conf is extracted to %%{buildroot}/usr/etc/... by pyproject_install
 %{__install} -d %{buildroot}%{_sysconfdir}
 mv %{buildroot}/usr/etc/* %{buildroot}%{_sysconfdir}
 %endif
@@ -156,6 +153,35 @@ mv %{buildroot}/usr/etc/* %{buildroot}%{_sysconfdir}
 
 
 %changelog
+* Fri Jul 31 2026 Ondřej Nosek <onosek@redhat.com> - 1.48-1
+- Handle repo-status API errors (artur)
+- Add --package option to fedpkg repo-status (artur)
+- Omit unused repos in repo-status (artur)
+- Separate Fedora and EPEL in repo-status (artur)
+- Add initial version of repo-status command (artur)
+- Migrate SCM requests from Pagure to Forgejo (patrik)
+- Clean up unnecessary Python 2 compatibility code (onosek)
+- Fixing ruff and flake8 complaints (onosek)
+- feat(new-package): add tests (sanjay.ankur)
+- feat(new-package): add util functions (sanjay.ankur)
+- feat(new-package): add new command (sanjay.ankur)
+- Unittests for PR#631 (onosek)
+- Allow detecting release from EPEL minor version feature branches
+  (carlwgeorge)
+- Fix Jenkinsfile for a Jenkins CI triggered from the Forge (onosek)
+- Web documentation at Readthedocs.io (onosek)
+- Post-migration steps (onosek)
+- `request_unretirement`: split branches into koji_tags and distgit_branches
+  (amedvede)
+- Add lookaside_http_version config option (onosek)
+- docs: modernize Sphinx conf.py (onosek)
+- `update`: Add --notes-file option to read notes from file (onosek)
+- License file without physical address (onosek)
+- Modularity retired - remove corresponding commands (onosek)
+- Various code linter issues fixed (onosek)
+- Check the correct sorting of imports from now on (onosek)
+- `request-unretirement`: fix unittests (onosek)
+
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.47-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 
@@ -182,7 +208,7 @@ mv %{buildroot}/usr/etc/* %{buildroot}%{_sysconfdir}
 - `update`: Add unspecified update type (priv.luk@gmail.com)
 - `request-unretirement`: Added a new command (amedvede)
 - `request-repo`: creating project and package in Anitya (amedvede)
-- Switch to %pyproject_* macros (onosek)
+- Switch to %%pyproject_* macros (onosek)
 - `retire`: extend the command's console help - `rhbz#2189969`_ (onosek)
 - Jenkinsfile: use local declaration instead of global (onosek)
 - `srpm`: --offline arg to prevent connecting to Koji – `#600`_ (onosek)

diff --git a/sources b/sources
index f1bc9f9..6a82f7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.47.tar.gz) = 7df8d8c41c68c354e2c6428c92b11d02ca2c8f27a1d414ac247b7f6d6e7b97eb64620d8d75b79087ccb50a3e321cc534fc37af234a4f27bc12a09ade0aec96ee
+SHA512 (fedpkg-1.48.tar.gz) = 5d5f911bbbf7ded31f665681b83de68ad9af7a980c96c6919c9d2d30eaac9430004eacbae087e3ad4af925e9d01193075ce472a203ed6aae4ea399c58cd1513f