[rpms/fedpkg] 1.48-1: New release 1.45

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 6327743769080ce67b9a3e2b311cf49b763efc36
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2024-06-26T05:35:17+00:00
            Stats  : +38/-210 in 8 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/6327743769080ce67b9a3e2b311cf49b763efc36?branch=1.48-1

            Log:
            New release 1.45

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

---
diff --git a/.gitignore b/.gitignore
index 8780598..14ac1ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
 /fedpkg-1.42.tar.bz2
 /fedpkg-1.43.tar.bz2
 /fedpkg-1.44.tar.bz2
+/fedpkg-1.45.tar.gz

diff --git a/0001-Do-not-use-pytest-related-dependencies-temporarily.patch b/0001-Do-not-use-pytest-related-dependencies-temporarily.patch
index c622ada..4b52e9b 100644
--- a/0001-Do-not-use-pytest-related-dependencies-temporarily.patch
+++ b/0001-Do-not-use-pytest-related-dependencies-temporarily.patch
@@ -16,7 +16,7 @@ index 2b1d1fd..40c5cbe 100755
                  ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
                  ],
  
--    setup_requires=['setuptools_scm', 'pytest-runner'],
+-    setup_requires=['pytest-runner'],
      install_requires=install_requires,
      tests_require=tests_require,
  

diff --git a/0002-Remove-pytest-coverage-execution.patch b/0002-Remove-pytest-coverage-execution.patch
index 639232c..fc17760 100644
--- a/0002-Remove-pytest-coverage-execution.patch
+++ b/0002-Remove-pytest-coverage-execution.patch
@@ -12,10 +12,13 @@ diff --git a/setup.cfg b/setup.cfg
 index c952275..3c47304 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -5,7 +5,6 @@ test = pytest
+@@ -5,10 +5,6 @@ test = pytest
  formats = bztar
  
  [tool:pytest]
+-# additional values for 'addopts' can be:
+-# --cov-report html
+-# -ra -q
 -addopts = --cov=fedpkg
  testpaths = test
  

diff --git a/0003-Remove-Environment-Markers-syntax.patch b/0003-Remove-Environment-Markers-syntax.patch
deleted file mode 100644
index 746200a..0000000
--- a/0003-Remove-Environment-Markers-syntax.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d59edea4da1aaeafa81ab09e9807993aa95d879c Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Wed, 7 Sep 2022 05:13:28 +0200
-Subject: [PATCH] Remove "Environment Markers" syntax
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- tests-requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests-requirements.txt b/tests-requirements.txt
-index a700317..be75121 100644
---- a/tests-requirements.txt
-+++ b/tests-requirements.txt
-@@ -1,4 +1,4 @@
--mock >= 1.0.1;python_version<"3.3"
-+mock >= 1.0.1
- coverage<5.0.0
- cccolutils
- gitpython
--- 
-2.37.2
-

diff --git a/0004-Fix-unittests-after-path-argument-is-validated.patch b/0004-Fix-unittests-after-path-argument-is-validated.patch
deleted file mode 100644
index 5b65471..0000000
--- a/0004-Fix-unittests-after-path-argument-is-validated.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e48214a679ed394079a3af684877f0acaae50866 Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Mon, 3 Apr 2023 00:20:00 +0200
-Subject: [PATCH] Fix unittests after '--path' argument is validated
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- test/test_cli.py | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/test/test_cli.py b/test/test_cli.py
-index 84d1935..ecc279d 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -10,6 +10,7 @@
- # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
- # the full text of the license.
- 
-+import argparse
- import io
- import json
- import os
-@@ -2306,13 +2307,17 @@ class TestReadReleasesFromLocalConfig(CliTestCase):
-         self.write_file(self.package_cfg,
-                         content='[koji]\ntargets=rawhide f28 fedora epel')
- 
--    @patch('os.path.exists', return_value=False)
--    def test_no_config_file_is_create(self, exists):
-+    @patch('pyrpkg.utils.validate_path')
-+    def test_no_config_file_is_create(self, validate_path):
-+        error_msg = 'given path \'{0}\' doesn\'t exist'.format(self.cloned_repo_path)
-+        validate_path.side_effect=argparse.ArgumentTypeError(error_msg)
-         with patch('sys.argv', new=self.fake_cmd):
--            cli = self.new_cli()
--
--        rels = cli.read_releases_from_local_config(self.active_releases)
--        self.assertIsNone(rels)
-+            with patch('sys.stderr', new=six.StringIO()):
-+                with self.assertRaises(SystemExit):  # argparse.ArgumentTypeError turns to SystemExit
-+                    self.new_cli()
-+                validate_path.assert_called_once_with(self.cloned_repo_path)
-+                output = sys.stderr.getvalue().strip()
-+                self.assertIn(error_msg, output)
- 
-     def test_no_build_target_is_configured(self):
-         with patch('sys.argv', new=self.fake_cmd):
--- 
-2.39.2
-

diff --git a/0005-Improve-invalid-branch-name-error-message.patch b/0005-Improve-invalid-branch-name-error-message.patch
deleted file mode 100644
index 7349b1b..0000000
--- a/0005-Improve-invalid-branch-name-error-message.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 6a381fd9cabcf9bc86efe8761f818ae00ae39bdc Mon Sep 17 00:00:00 2001
-From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
-Date: Fri, 21 Apr 2023 12:33:56 +0300
-Subject: [PATCH] Improve invalid branch name error message
-
-Currently, if the resolved release name does not match any supported
-pattern ('rawhide', 'f38' or so), the following error is printed:
-
-    (foo) $ fedpkg prep
-    Could not execute prep: Could not find the release/dist from branch name foo
-    Please specify with --release
-
-This is fine when the current Git branch name was used when resolving
-the release. However, the exact same error is printed even if the
-'--release' option was used, like this:
-
-    $ fedpkg --release foo prep
-    Could not execute prep: Could not find the release/dist from branch name foo
-    Please specify with --release
-
-The error message is split into two cases depending on if --release was
-used (detected by checking if 'self.dist' is truthy):
-
-    (foo) $ fedpkg prep
-    Could not execute prep: Could not find release from branch name 'foo'. Please specify with --release.
-    $ fedpkg --release foo prep
-    Could not execute prep: Invalid release 'foo'.
-
-JIRA: RHELCMP-11465
-Fixes: https://pagure.io/rpkg/issue/671
-Merges: https://pagure.io/fedpkg/pull-request/518
-
-Signed-off-by: Otto Liljalaakso <otto.liljalaakso@iki.fi>
----
- fedpkg/__init__.py | 10 +++++++---
- test/test_cli.py   |  5 +++--
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index 9973286..b01ca73 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -138,9 +138,13 @@ class Commands(pyrpkg.Commands):
-             self._distunset = 'rhel'
-         # If we don't match one of the above, punt
-         else:
--            raise pyrpkg.rpkgError('Could not find the release/dist from branch name '
--                                   '%s\nPlease specify with --release' %
--                                   self.branch_merge)
-+            if self.dist:
-+                msg = 'Invalid release \'%s\'.' % self.branch_merge
-+            else:
-+                msg = ('Could not find release from branch name \'%s\'. '
-+                       'Please specify with --release.' % self.branch_merge)
-+            raise pyrpkg.rpkgError(msg)
-+
-         self._rpmdefines = ["--define", "_sourcedir %s" % self.layout.sourcedir,
-                             "--define", "_specdir %s" % self.layout.specdir,
-                             "--define", "_builddir %s" % self.layout.builddir,
-diff --git a/test/test_cli.py b/test/test_cli.py
-index ecc279d..e0a1918 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -2310,10 +2310,11 @@ class TestReadReleasesFromLocalConfig(CliTestCase):
-     @patch('pyrpkg.utils.validate_path')
-     def test_no_config_file_is_create(self, validate_path):
-         error_msg = 'given path \'{0}\' doesn\'t exist'.format(self.cloned_repo_path)
--        validate_path.side_effect=argparse.ArgumentTypeError(error_msg)
-+        validate_path.side_effect = argparse.ArgumentTypeError(error_msg)
-         with patch('sys.argv', new=self.fake_cmd):
-             with patch('sys.stderr', new=six.StringIO()):
--                with self.assertRaises(SystemExit):  # argparse.ArgumentTypeError turns to SystemExit
-+                # argparse.ArgumentTypeError turns to SystemExit
-+                with self.assertRaises(SystemExit):
-                     self.new_cli()
-                 validate_path.assert_called_once_with(self.cloned_repo_path)
-                 output = sys.stderr.getvalue().strip()
--- 
-2.40.0
-

diff --git a/fedpkg.spec b/fedpkg.spec
index afb3416..1e9bcfe 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,29 +4,17 @@
 %endif
 
 Name:           fedpkg
-Version:        1.44
-Release:        9%{?dist}
+Version:        1.45
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
 URL:            https://pagure.io/fedpkg
-Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
-
-# RHEL7 is currently the only release that is built for Python 2.
-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
+Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 Patch1:         0001-Do-not-use-pytest-related-dependencies-temporarily.patch
 Patch2:         0002-Remove-pytest-coverage-execution.patch
-%if %{with python2}
-Patch3:         0003-Remove-Environment-Markers-syntax.patch
-%endif
-Patch4:         0004-Fix-unittests-after-path-argument-is-validated.patch
-Patch5:         0005-Improve-invalid-branch-name-error-message.patch
 
 BuildRequires:  pkgconfig
 BuildRequires:  bash-completion
@@ -35,39 +23,11 @@ BuildRequires:  git
 Requires:       koji
 Requires:       redhat-rpm-config
 
-%if %{with python2}
-# This package redefines __python and can use the python_ macros
-%global __python %{__python2}
-
-BuildRequires:  python2-devel
-# We br these things for man page generation due to imports
-BuildRequires:  python2-rpkg >= 1.66-7
-BuildRequires:  python2-distro
-BuildRequires:  python2-fedora
-# For testing
-BuildRequires:  python2-mock
-BuildRequires:  python2-nose
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-freezegun
-
-BuildRequires:  bodhi-client >= 2.0
-BuildRequires:  python-bugzilla
-
-Requires:       bodhi-client >= 2.0
-Requires:       python-bugzilla
-Requires:       python2-rpkg >= 1.66-7
-Requires:       python2-distro
-Requires:       python2-fedora
-Requires:       python2-openidc-client >= 0.6.0
-Requires:       fedora-packager
-
-# python3
-%else
 # This package redefines __python and can use the python_ macros
 %global __python %{__python3}
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpkg >= 1.66-7
+BuildRequires:  python3-rpkg >= 1.67-1
 BuildRequires:  python3-distro
 BuildRequires:  python3-fedora
 # For testing
@@ -79,14 +39,13 @@ BuildRequires:  python3-bodhi-client
 
 
 Requires:       python3-bugzilla
-Requires:       python3-rpkg >= 1.66-7
+Requires:       python3-rpkg >= 1.67-1
 Requires:       python3-distro
 Requires:       python3-fedora
 Requires:       python3-openidc-client >= 0.6.0
 Requires:       python3-bodhi-client
 Requires:       python3-setuptools
 Recommends:     fedora-packager
-%endif
 
 
 %description
@@ -118,11 +77,7 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 
 
 %check
-%if %{with python2}
-%{__python2} -m nose
-%else
 %pytest
-%endif
 
 
 %files
@@ -133,13 +88,8 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 %{_bindir}/%{name}
 %{_mandir}/*/*
 # For noarch packages: sitelib
-%if %{with python2}
-%{python2_sitelib}/%{name}
-%{python2_sitelib}/%{name}-%{version}-py*.egg-info
-%else
 %{python3_sitelib}/%{name}
 %{python3_sitelib}/%{name}-%{version}-py*.egg-info
-%endif
 # zsh completion
 %{_datadir}/zsh/site-functions/_%{name}
 
@@ -149,6 +99,32 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 
 
 %changelog
+* Wed Jun 26 2024 Ondřej Nosek <onosek@redhat.com> - 1.45-1
+- Allow package.cfg on rawhide/main branch (sgallagh)
+- Fix datetime.utcnow deprecation warning (dherrera)
+- Remove Python 2.7 support (onosek)
+- Fix tests on Python 3.12 by fixing pkg_resources dependency (dherrera)
+- Remove traces of PDC in docstrings (lsegura)
+- Remove function get_sl_type, no longer needed (lsegura)
+- Remove pdc calls, use bodhi instead (lsegura)
+- Update docker image for Jenkinks tests (onosek)
+- Methods for setting API tokens use getpass - 2089694 (onosek)
+- Update the sendemail.to Fedora email addresses (miro)
+- Remove epel-playground support (otto.liljalaakso)
+- disable-monitoring: run manually only (onosek)
+- `fedpkg update`: add option `--severity` (onosek)
+- Allow fetching release from branch basename (pemensik)
+- Lookaside cache operations retries (onosek)
+- check_branch: Fix backwards error message (otaylor)
+- Fix flake8 complaints (onosek)
+- fix: change changelog link (amedvede)
+- Update link to the `Share Test Code` documentation (psplicha)
+- Corrected the description of --namespace. (Bjorn)
+- Improve invalid branch name error message (otto.liljalaakso)
+- Fix unittests after '--path' argument is validated (onosek)
+- Remove unused arches from completion (mikel)
+- Update docker image for Jenkinks tests (onosek)
+
 * Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 1.44-9
 - Rebuilt for Python 3.13
 

diff --git a/sources b/sources
index cd36b47..9250a23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.44.tar.bz2) = 729644e43069627a6aacfccf08b9d04bbf0875b9ce5ef47fd19db1a31c6556174afbc89551ecb349f16f06272e8d8848ae6359c2672ca7a94f3c1b2dfc97166f
+SHA512 (fedpkg-1.45.tar.gz) = a757799bdf52e59ec2a9bd218b0ab49d7ab85d52bc1b13938daef23dd46057c7f54661527f82bc5950d77e690847c0cb8f975836fbf05b6a76c8c07a5971b379