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

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 89e5e05f1904a92fae7f5c7f97b3dffa04576143
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2025-01-07T22:59:26+00:00
            Stats  : +300/-1 in 7 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/89e5e05f1904a92fae7f5c7f97b3dffa04576143?branch=1.48-1

            Log:
            A few patches:

- gitignore the name-version-build/ directory created by fedpkg prep/local
- Fixing unittests for py36
- Fix tests on EPEL 9/10.
- Add setuptools to dependencies for Python 3.12+
- Update expired token exception instructions
- Clone epel10 branches with clone -B

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

---
diff --git a/0028-gitignore-the-name-version-build-directory-created-b.patch b/0028-gitignore-the-name-version-build-directory-created-b.patch
new file mode 100644
index 0000000..d68d2e8
--- /dev/null
+++ b/0028-gitignore-the-name-version-build-directory-created-b.patch
@@ -0,0 +1,44 @@
+From 062ab746dbd43ff502da9e20f84466adc33345df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Mon, 18 Nov 2024 18:09:31 +0100
+Subject: [PATCH 1/6] gitignore the name-version-build/ directory created by
+ fedpkg prep/local
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This directory is created by RPM 4.20+
+
+Signed-off-by: Miro Hrončok <miro@hroncok.cz>
+---
+ conf/etc/rpkg/fedpkg-stage.conf | 1 +
+ conf/etc/rpkg/fedpkg.conf       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
+index 8f92fc8..87d66fe 100644
+--- a/conf/etc/rpkg/fedpkg-stage.conf
++++ b/conf/etc/rpkg/fedpkg-stage.conf
+@@ -46,6 +46,7 @@ git_excludes =
+   /*.src.rpm
+   /build*.log
+   /.build-*.log
++  /*-build/
+   results/
+   results_*/
+   clog
+diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
+index c4ab51a..ed4c318 100644
+--- a/conf/etc/rpkg/fedpkg.conf
++++ b/conf/etc/rpkg/fedpkg.conf
+@@ -46,6 +46,7 @@ git_excludes =
+   /*.src.rpm
+   /build*.log
+   /.build-*.log
++  /*-build/
+   results/
+   results_*/
+   clog
+-- 
+2.47.1
+

diff --git a/0029-Fixing-unittests-for-py36.patch b/0029-Fixing-unittests-for-py36.patch
new file mode 100644
index 0000000..22c8020
--- /dev/null
+++ b/0029-Fixing-unittests-for-py36.patch
@@ -0,0 +1,33 @@
+From 985e42039a399846a54a41aecd637d128197ba7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
+Date: Tue, 7 Jan 2025 04:10:16 +0100
+Subject: [PATCH 2/6] Fixing unittests for py36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is an issue with the newest pycurl library in PyPI.
+Use the older one for this environment.
+
+Signed-off-by: Ondřej Nosek <onosek@redhat.com>
+---
+ tox.ini | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tox.ini b/tox.ini
+index ea4dc6b..3450087 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -23,6 +23,9 @@ setenv=
+ 
+ [testenv:py36]
+ package = sdist
++deps =
++    {[testenv]deps}
++    pycurl<7.45.4
+ 
+ [testenv:flake8]
+ skip_install = True
+-- 
+2.47.1
+

diff --git a/0030-Fix-tests-on-EPEL-9-10.patch b/0030-Fix-tests-on-EPEL-9-10.patch
new file mode 100644
index 0000000..c2c9d67
--- /dev/null
+++ b/0030-Fix-tests-on-EPEL-9-10.patch
@@ -0,0 +1,47 @@
+From 042ee46d6ee69ed33e978b8a51e7a0e6d8260ac4 Mon Sep 17 00:00:00 2001
+From: Romain Geissler <romain.geissler@amadeus.com>
+Date: Sun, 5 Jan 2025 23:26:50 +0000
+Subject: [PATCH 3/6] Fix tests on EPEL 9/10.
+
+Indeed in EPEL distro.like() returns "rhel fedora" while on fedora it
+returns an empty string.
+
+Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
+---
+ test/test_commands.py | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_commands.py b/test/test_commands.py
+index d160da9..b08a7fe 100644
+--- a/test/test_commands.py
++++ b/test/test_commands.py
+@@ -24,20 +24,23 @@ class TestDetermineRuntimeEnv(CommandTestCase):
+         self.cmd = self.make_commands()
+ 
+     @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_id):
++    def test_return_fedora_disttag(self, mock_ver, mock_like, mock_id):
+         result = self.cmd._determine_runtime_env()
+         self.assertEqual('fc25', result)
+ 
+     @patch('distro.id', return_value='')
+-    def test_return_None_if_os_is_unknown(self, mock_id):
++    @patch('distro.like', return_value='')
++    def test_return_None_if_os_is_unknown(self, mock_like, mock_id):
+         self.assertEqual(None, self.cmd._determine_runtime_env())
+ 
+     @patch('distro.os_release_info', return_value={'variant': 'ELN'})
+     @patch('distro.id', return_value='fedora')
++    @patch('distro.like', return_value='')
+     @patch('distro.major_version', return_value='41')
+     @patch('pyrpkg.Commands.kojisession', new_callable=PropertyMock)
+-    def test_return_for_eln(self, mock_koji, mock_ver, mock_id, mock_info):
++    def test_return_for_eln(self, mock_koji, mock_ver, mock_like, mock_id, mock_info):
+         self.cmd._kojisession = Mock()
+         koji_session = mock_koji.return_value
+         koji_session.getBuildConfig.return_value = {
+-- 
+2.47.1
+

diff --git a/0031-Add-setuptools-to-dependencies-for-Python-3.12.patch b/0031-Add-setuptools-to-dependencies-for-Python-3.12.patch
new file mode 100644
index 0000000..fd1a23d
--- /dev/null
+++ b/0031-Add-setuptools-to-dependencies-for-Python-3.12.patch
@@ -0,0 +1,30 @@
+From 0939d87670cbfccef1422254c3c83cc20b7f2341 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
+Date: Sun, 22 Sep 2024 02:36:49 -0400
+Subject: [PATCH 4/6] Add setuptools to dependencies for Python 3.12+
+
+Since the package still uses pkg_resources, in Python 3.12 it requires
+the installation of setuptools which is no longer available by default.
+
+Merges: https://pagure.io/fedpkg/pull-request/571
+
+Signed-off-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
+---
+ pyproject.toml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 8cf7880..fdc00ad 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -29,6 +29,7 @@ dependencies = [
+     "openidc-client",
+     "python-bugzilla",
+     "rpkg",
++    "setuptools;python_version>='3.12'",
+ ]
+ 
+ [project.scripts]
+-- 
+2.47.1
+

diff --git a/0032-Update-expired-token-exception-instructions.patch b/0032-Update-expired-token-exception-instructions.patch
new file mode 100644
index 0000000..1f4dceb
--- /dev/null
+++ b/0032-Update-expired-token-exception-instructions.patch
@@ -0,0 +1,55 @@
+From c0f9604f9c9c58e13c2a667745efc6612a891131 Mon Sep 17 00:00:00 2001
+From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
+Date: Sun, 22 Sep 2024 01:51:06 -0400
+Subject: [PATCH 5/6] Update expired token exception instructions
+
+The exception used to instruct the user to run the command
+`fedpkg set-pagure-token <token>`, which doesn't work. The command
+only accepts the token interactively at a prompt, not on the command
+line (presumably for security purposes). Exception message and
+unit test for same adjusted accordingly.
+
+Merges: https://pagure.io/fedpkg/pull-request/570
+
+Signed-off-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
+---
+ fedpkg/utils.py    | 6 ++++--
+ test/test_utils.py | 5 +++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/fedpkg/utils.py b/fedpkg/utils.py
+index 0669c3f..0c54ba1 100644
+--- a/fedpkg/utils.py
++++ b/fedpkg/utils.py
+@@ -93,8 +93,10 @@ def new_pagure_issue(logger, url, token, title, body, cli_name):
+         # show hint for expired token
+         if re.search(r"Invalid or expired token", rv_error, re.IGNORECASE):
+             base_error_msg += '\nFor invalid or expired tokens please ' \
+-                'set a new token in your user configuration with:' \
+-                '\n\n\t{0} set-pagure-token <token>\n'.format(cli_name)
++                'set a new token in your user configuration by running:' \
++                '\n\n\t{0} set-pagure-token\n\n' \
++                'The command is interactive; enter the new token when ' \
++                'prompted.\n'.format(cli_name)
+         raise rpkgError(base_error_msg.format(rv_error))
+ 
+     return '{0}/releng/fedora-scm-requests/issue/{1}'.format(
+diff --git a/test/test_utils.py b/test/test_utils.py
+index 09ddbdb..19ad2f8 100644
+--- a/test/test_utils.py
++++ b/test/test_utils.py
+@@ -388,8 +388,9 @@ class TestNewPagureIssue(unittest.TestCase):
+         self.assertRaisesRegex(
+             rpkgError,
+             '\nFor invalid or expired tokens please '
+-            'set a new token in your user configuration with:'
+-            '\n\n\tfedpkg set-pagure-token <token>\n',
++            'set a new token in your user configuration by running:'
++            '\n\n\tfedpkg set-pagure-token\n\n'
++            'The command is interactive; enter the new token when prompted.',
+             utils.new_pagure_issue,
+             logger, 'http://distgit/', '123456', 'new package', {'repo': 'pkg1'}, 'fedpkg')
+ 
+-- 
+2.47.1
+

diff --git a/0033-Clone-epel10-branches-with-clone-B.patch b/0033-Clone-epel10-branches-with-clone-B.patch
new file mode 100644
index 0000000..8ce737a
--- /dev/null
+++ b/0033-Clone-epel10-branches-with-clone-B.patch
@@ -0,0 +1,76 @@
+From 6511fa265649b0f36ee2acf7f9e99782c30d5c3f Mon Sep 17 00:00:00 2001
+From: Carl George <carlwgeorge@gmail.com>
+Date: Thu, 3 Oct 2024 01:10:16 -0500
+Subject: [PATCH 6/6] Clone epel10 branches with clone -B
+
+Running `fedpkg clone -B` relies on the configured branch regex to
+determine the branches to clone.  The current regex doesn't match EPEL
+branches with more that one digit.  We recently started having epel10
+branches, and in the future we'll also have epel10.0, epel10.1, and so
+forth.  This adjusts the regex to account for these branch names.
+
+Merges: https://pagure.io/fedpkg/pull-request/572
+
+Signed-off-by: Carl George <carlwgeorge@gmail.com>
+---
+ conf/etc/rpkg/fedpkg-stage.conf | 2 +-
+ conf/etc/rpkg/fedpkg.conf       | 2 +-
+ test/fedpkg-stage.conf          | 2 +-
+ test/fedpkg-test.conf           | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
+index 87d66fe..e6f6f15 100644
+--- a/conf/etc/rpkg/fedpkg-stage.conf
++++ b/conf/etc/rpkg/fedpkg-stage.conf
+@@ -4,7 +4,7 @@ lookasidehash = sha512
+ lookaside_cgi = https://src.stg.fedoraproject.org/repo/pkgs/upload.cgi
+ gitbaseurl = ssh://%(user)s@pkgs.stg.fedoraproject.org/%(repo)s
+ anongiturl = https://src.stg.fedoraproject.org/%(repo)s.git
+-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
++branchre = f\d$|f\d\d$|epel\d+(?:\.\d+)?$|olpc\d$|rawhide$
+ kojiprofile = stg
+ build_client = koji
+ clone_config_rpms =
+diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
+index ed4c318..d7da904 100644
+--- a/conf/etc/rpkg/fedpkg.conf
++++ b/conf/etc/rpkg/fedpkg.conf
+@@ -4,7 +4,7 @@ lookasidehash = sha512
+ lookaside_cgi = https://src.fedoraproject.org/repo/pkgs/upload.cgi
+ gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(repo)s
+ anongiturl = https://src.fedoraproject.org/%(repo)s.git
+-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
++branchre = f\d$|f\d\d$|epel\d+(?:\.\d+)?$|olpc\d$|rawhide$
+ kojiprofile = koji
+ build_client = koji
+ clone_config_rpms =
+diff --git a/test/fedpkg-stage.conf b/test/fedpkg-stage.conf
+index 14748a1..60fde62 100644
+--- a/test/fedpkg-stage.conf
++++ b/test/fedpkg-stage.conf
+@@ -4,7 +4,7 @@ gitbaseurl = ssh://%(user)s@pkgs.stg.example.com/%(repo)s
+ lookaside_cgi = https://pkgs.stg.example.com/repo/pkgs/upload.cgi
+ lookasidehash = sha512
+ lookaside = http://pkgs.stg.example.com/repo/pkgs
+-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
++branchre = f\d$|f\d\d$|epel\d+(?:\.\d+)?$|olpc\d$|rawhide$
+ kojiprofile = koji
+ build_client = koji
+ distgit_namespaced = True
+diff --git a/test/fedpkg-test.conf b/test/fedpkg-test.conf
+index 44b331a..51d2de3 100644
+--- a/test/fedpkg-test.conf
++++ b/test/fedpkg-test.conf
+@@ -4,7 +4,7 @@ gitbaseurl = ssh://%(user)s@pkgs.example.com/%(repo)s
+ lookaside_cgi = https://pkgs.example.com/repo/pkgs/upload.cgi
+ lookasidehash = sha512
+ lookaside = http://pkgs.example.com/repo/pkgs
+-branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
++branchre = f\d$|f\d\d$|epel\d+(?:\.\d+)?$|olpc\d$|rawhide$
+ kojiprofile = koji
+ build_client = koji
+ distgit_namespaced = True
+-- 
+2.47.1
+

diff --git a/fedpkg.spec b/fedpkg.spec
index 5b26575..18138a1 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.45
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
@@ -41,6 +41,12 @@ Patch24:        0024-Get-macros-from-epel-candidate-build-target.patch
 Patch25:        0025-Improvements-on-string-parsing.patch
 Patch26:        0026-Add-tests-cases-for-runtime_disttag-removal-when-wor.patch
 Patch27:        0027-Handle-rhel-runtimes-when-minor-version-exists-in-di.patch
+Patch28:        0028-gitignore-the-name-version-build-directory-created-b.patch
+Patch29:        0029-Fixing-unittests-for-py36.patch
+Patch30:        0030-Fix-tests-on-EPEL-9-10.patch
+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
 
 BuildRequires:  pkgconfig
 BuildRequires:  bash-completion
@@ -123,6 +129,14 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 
 
 %changelog
+* Tue Jan 07 2025 Ondřej Nosek <onosek@redhat.com> - 1.45-6
+- gitignore the name-version-build/ directory created by fedpkg prep/local
+- Fixing unittests for py36
+- Fix tests on EPEL 9/10.
+- Add setuptools to dependencies for Python 3.12+
+- Update expired token exception instructions
+- Clone epel10 branches with clone -B
+
 * Wed Sep 18 2024 Ondřej Nosek <onosek@redhat.com> - 1.45-5
 - Add py313 environment as that's current
 - Drop support for bodhi-client <= 5