public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fedpkg] 1.48-1: New release 1.38
@ 2026-08-10 21:45
0 siblings, 0 replies; 2+ messages in thread
From: @ 2026-08-10 21:45 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/fedpkg
Branch : 1.48-1
Commit : eef92ff9c6f972a888a145830470c28ef4ed93f1
Author : Ondřej Nosek <onosek@redhat.com>
Date : 2020-03-02T22:25:49+00:00
Stats : +41/-318 in 9 file(s)
URL : https://src.fedoraproject.org/rpms/fedpkg/c/eef92ff9c6f972a888a145830470c28ef4ed93f1?branch=1.48-1
Log:
New release 1.38
Signed-off-by: Ondřej Nosek <onosek@redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 6bf0b86..e29498e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/fedpkg-1.35.tar.bz2
/fedpkg-1.36.tar.bz2
/fedpkg-1.37.tar.bz2
+/fedpkg-1.38.tar.bz2
diff --git a/0001-Bump-check-for-bodhi-client.patch b/0001-Bump-check-for-bodhi-client.patch
deleted file mode 100644
index 9a77448..0000000
--- a/0001-Bump-check-for-bodhi-client.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b78a5ee21f5bd9d07aa2ace7177ac0f49ee11c06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Fri, 31 May 2019 09:36:10 +0200
-Subject: [PATCH] Bump check for bodhi client
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There should be no change on the client for what fedpkg is using.
-
-Fixes: https://pagure.io/fedpkg/issue/330
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- fedpkg/cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index e8ebe4a..d7b0872 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -84,7 +84,7 @@ def check_bodhi_version():
- except pkg_resources.DistributionNotFound:
- raise rpkgError('bodhi-client < 2.0 is not supported.')
- major = int(dist.version.split('.', 1)[0])
-- if major >= 4:
-+ if major >= 5:
- raise rpkgError(
- 'This system has bodhi v{0}, which is unsupported.'.format(major))
-
---
-2.20.1
-
diff --git a/0002-Support-for-epel-playground-branch-requests.patch b/0002-Support-for-epel-playground-branch-requests.patch
deleted file mode 100644
index 7f07f0c..0000000
--- a/0002-Support-for-epel-playground-branch-requests.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From eabb5ae7dd0495f67b73d76137df78b84e2792ec Mon Sep 17 00:00:00 2001
-From: Mohan Boddu <mboddu@bhujji.com>
-Date: Tue, 9 Jul 2019 22:07:06 -0400
-Subject: [PATCH 1/2] Support for epel*-playground branch requests
-
-Fixes: #334
-JIRA: COMPOSE-3677
-Merges: https://pagure.io/fedpkg/pull-request/336
-
-Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
----
- fedpkg/cli.py | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index d7b0872..1732a22 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -904,10 +904,26 @@ targets to build the package for a particular stream.
- 'a git repository')
-
- pdc_url = config.get('{0}.pdc'.format(name), 'url')
-+ # When a 'epel\d' branch is requested, it should automatically request
-+ # 'epel\d+-playground' branch.
-+ epel_playground = False
-+ epel_version = None
- if branch:
-+ # Check if the requested branch is an epel branch
-+ match = re.match(r'^epel(?P<epel_version>\d+)$', branch)
-+ if match:
-+ epel_playground = True
-+ epel_version = int(match.groupdict()["epel_version"])
-+
- if is_epel(branch):
- assert_valid_epel_package(repo_name, branch)
-
-+ # Requesting epel\d-playground branches is not allowed
-+ if bool(re.match(r'^epel\d+-playground$', branch)):
-+ raise rpkgError(
-+ 'You cannot directly request {0} branch, as they are '
-+ 'created as part of epel branch requests'.format(branch))
-+
- if ns in ['modules', 'test-modules', 'flatpaks']:
- branch_valid = bool(re.match(r'^[a-zA-Z0-9.\-_+]+$', branch))
- if not branch_valid:
-@@ -941,6 +957,11 @@ targets to build the package for a particular stream.
- *list(get_release_branches(pdc_url).values())))
- branches = [b for b in release_branches
- if re.match(r'^(f\d+)$', b)]
-+ # If the requested branch is epel branch then also add epel\d+-playground branch
-+ # to the request list.
-+ # TODO: Remove the check for epel version >= 7 when we enable playground for epel7
-+ elif epel_playground and epel_version >= 7:
-+ branches = [branch, branch+"-playground"]
- else:
- branches = [branch]
-
-@@ -968,6 +989,7 @@ targets to build the package for a particular stream.
- auto_module = (
- ns == 'rpms'
- and not re.match(RELEASE_BRANCH_REGEX, b)
-+ and not epel_playground # Dont run auto_module on epel requests
- and not no_auto_module
- )
- if auto_module:
---
-2.20.1
-
diff --git a/0003-Allow-epel-playground-requests-for-epel8-and-newer.patch b/0003-Allow-epel-playground-requests-for-epel8-and-newer.patch
deleted file mode 100644
index 06c175d..0000000
--- a/0003-Allow-epel-playground-requests-for-epel8-and-newer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f97d06c785a837ed860a20660ac6344ec546802c Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Thu, 18 Jul 2019 10:01:27 +0200
-Subject: [PATCH 2/2] Allow epel*-playground requests for epel8 and newer
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- fedpkg/cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index 1732a22..8e73f0f 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -960,7 +960,7 @@ targets to build the package for a particular stream.
- # If the requested branch is epel branch then also add epel\d+-playground branch
- # to the request list.
- # TODO: Remove the check for epel version >= 7 when we enable playground for epel7
-- elif epel_playground and epel_version >= 7:
-+ elif epel_playground and epel_version >= 8:
- branches = [branch, branch+"-playground"]
- else:
- branches = [branch]
---
-2.20.1
-
diff --git a/0004-Add-epel-playground-into-rpmdefines.patch b/0004-Add-epel-playground-into-rpmdefines.patch
deleted file mode 100644
index f848967..0000000
--- a/0004-Add-epel-playground-into-rpmdefines.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 27366b3e35008d0ffef6986555693b1874586795 Mon Sep 17 00:00:00 2001
-From: Stephen Smoogen <smooge@gmail.com>
-Date: Mon, 22 Jul 2019 13:04:30 -0400
-Subject: [PATCH] Add epel*-playground into rpmdefines
-
-Signed-off-by: Stephen Smoogen <smooge@gmail.com>
-Merges: https://pagure.io/fedpkg/pull-request/343
----
- fedpkg/__init__.py | 7 +++++++
- test/test_commands.py | 15 +++++++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index f66cb12..fd050e6 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -141,6 +141,13 @@ class Commands(pyrpkg.Commands):
- self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch)
- self.override = 'epel%s-override' % self._distval
- self._distunset = 'fedora'
-+ elif re.match(r'epel\d+-playground$', self.branch_merge):
-+ self._distval = re.search(r'\d+', self.branch_merge).group(0)
-+ self._distvar = 'rhel'
-+ self._disttag = 'el%s_playground' % self._distval
-+ self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch)
-+ self.override = 'epel%s-override' % self._distval
-+ self._distunset = 'fedora'
- elif re.match(r'olpc\d$', self.branch_merge):
- self._distval = self.branch_merge.split('olpc')[1]
- self._distvar = 'olpc'
-diff --git a/test/test_commands.py b/test/test_commands.py
-index 7824f9f..ebf4a3f 100644
---- a/test/test_commands.py
-+++ b/test/test_commands.py
-@@ -245,6 +245,21 @@ class TestLoadRpmDefines(CommandTestCase):
-
- self.assert_rpmdefines()
-
-+ @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
-+ def test_load_epel8_playground_dist_tag(self, branch_merge):
-+ branch_merge.return_value = 'epel8-playground'
-+
-+ self.cmd.load_rpmdefines()
-+
-+ self.assertEqual('8', self.cmd._distval)
-+ self.assertEqual('rhel', self.cmd._distvar)
-+ self.assertEqual('el8_playground', self.cmd._disttag)
-+ self.assertEqual('epel-8-i686', self.cmd.mockconfig)
-+ self.assertEqual('epel8-override', self.cmd.override)
-+ self.assertTrue(hasattr(self.cmd, '_distunset'))
-+
-+ self.assert_rpmdefines()
-+
- @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
- @patch('fedpkg.Commands._findmasterbranch')
- def test_load_master_dist_tag(self, _findmasterbranch, branch_merge):
---
-2.21.0
-
diff --git a/0005-Use-package.cfg-for-epel8-branches.patch b/0005-Use-package.cfg-for-epel8-branches.patch
deleted file mode 100644
index 59f2228..0000000
--- a/0005-Use-package.cfg-for-epel8-branches.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 702d68544d20e9cc3f2eb820dacb12f5fd76e8b0 Mon Sep 17 00:00:00 2001
-From: Mohan Boddu <mboddu@bhujji.com>
-Date: Fri, 26 Jul 2019 11:40:00 -0400
-Subject: [PATCH] Use package.cfg for epel8+ branches
-
-Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
-Merges: https://pagure.io/fedpkg/pull-request/348
----
- fedpkg/utils.py | 28 +++++++++++++++++++++++-----
- test/test_utils.py | 4 +++-
- 2 files changed, 26 insertions(+), 6 deletions(-)
-
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index ea25439..fcaa6ec 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -350,11 +350,25 @@ def get_stream_branches(server_url, package_name):
- # Please remember to review the data regularly, there are only stream
- # branches, or some new replacement of PDC fixes the issue as well, it
- # should be ok to remove if from this list.
-- return [
-- item for item in branches
-- if not re.match(r'^(f|el|epel)\d+$', item['name']) and
-- item['name'] != 'master'
-- ]
-+ stream_branches = []
-+ for item in branches:
-+ if item['name'] == 'master':
-+ continue
-+ elif re.match(r'^(f|el)\d+$', item['name']):
-+ continue
-+ # epel7 is regular release branch
-+ # epel8 and above should be considered a stream branch to use
-+ # package.cfg file in the branch.
-+ elif 'epel7' == item['name']:
-+ continue
-+ # epel8-playground and above playground branches should be considered
-+ # as release branches so that it will use epelX-playground-candidate
-+ # target to build.
-+ elif re.match(r'^epel\d+-playground$', item['name']):
-+ continue
-+ else:
-+ stream_branches.append(item)
-+ return stream_branches
-
-
- def expand_release(rel, active_releases):
-@@ -379,5 +393,9 @@ def expand_release(rel, active_releases):
- return active_releases['epel']
- elif rel in active_releases['fedora'] or rel in active_releases['epel']:
- return [rel]
-+ # if epelX-playground branch then return the release to use
-+ # epelX-playground-candidate target
-+ elif re.match(r'^epel\d+-playground$', rel):
-+ return [rel]
- else:
- return None
-diff --git a/test/test_utils.py b/test/test_utils.py
-index 74db227..1ee4ce8 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -468,13 +468,15 @@ class TestGetStreamBranches(unittest.TestCase):
- {'name': 'f28'},
- {'name': 'epel7'},
- {'name': 'master'},
-+ {'name': 'epel8'},
-+ {'name': 'epel8-playground'}
- ],
- 'next': None
- }
- get.return_value = rv
-
- result = utils.get_stream_branches('http://localhost/', 'pkg')
-- self.assertEqual([{'name': '8'}, {'name': '10'}], list(result))
-+ self.assertEqual([{'name': '8'}, {'name': '10'}, {'name': 'epel8'}], list(result))
-
-
- class TestExpandRelease(unittest.TestCase):
---
-2.21.0
-
diff --git a/0007-Removes-check-of-bodhi-client-version.patch b/0007-Removes-check-of-bodhi-client-version.patch
deleted file mode 100644
index a2c56f8..0000000
--- a/0007-Removes-check-of-bodhi-client-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 183f6f30ac7a8183dd253b0d6a5145b6ad4ebade Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Mon, 3 Feb 2020 16:16:43 +0100
-Subject: [PATCH] Removes check of bodhi-client version
-
-Modification of this part of the code is not needed now when a new
-major version of Bodhi is released (if there are not incompatibilities
-with previous Bodhi version).
-
-Fixes: rhbz#1796972
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- fedpkg/cli.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index ebf3a88..e2291ff 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -87,13 +87,9 @@ require_testcases=%(require_testcases)s
-
- def check_bodhi_version():
- try:
-- dist = pkg_resources.get_distribution('bodhi_client')
-+ pkg_resources.get_distribution('bodhi_client')
- except pkg_resources.DistributionNotFound:
- raise rpkgError('bodhi-client < 2.0 is not supported.')
-- major = int(dist.version.split('.', 1)[0])
-- if major >= 5:
-- raise rpkgError(
-- 'This system has bodhi v{0}, which is unsupported.'.format(major))
-
-
- class fedpkgClient(cliClient):
---
-2.21.1
-
diff --git a/fedpkg.spec b/fedpkg.spec
index 33c6c55..caf5cfe 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,8 +4,8 @@
%endif
Name: fedpkg
-Version: 1.37
-Release: 13%{?dist}
+Version: 1.38
+Release: 1%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -13,13 +13,6 @@ URL: https://pagure.io/fedpkg
Source0: https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
BuildArch: noarch
-Patch0: 0001-Bump-check-for-bodhi-client.patch
-Patch1: 0002-Support-for-epel-playground-branch-requests.patch
-Patch2: 0003-Allow-epel-playground-requests-for-epel8-and-newer.patch
-Patch3: 0004-Add-epel-playground-into-rpmdefines.patch
-Patch4: 0005-Use-package.cfg-for-epel8-branches.patch
-Patch5: 0006-display_name-added-to-bodhi.template.patch
-Patch6: 0007-Removes-check-of-bodhi-client-version.patch
# fedpkg command switched to python3 on Fedora 29 and RHEL > 7:
%if 0%{?fedora} > 28 || 0%{?rhel} > 7
@@ -42,7 +35,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.59-4
+BuildRequires: python2-rpkg >= 1.59-5
BuildRequires: python2-distro
# This until fedora-cert gets fixed
BuildRequires: python2-fedora
@@ -75,7 +68,7 @@ BuildRequires: python2-bugzilla
Requires: python2-bugzilla
%endif
-Requires: python2-rpkg >= 1.59-4
+Requires: python2-rpkg >= 1.59-5
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -86,7 +79,7 @@ Requires: python2-openidc-client >= 0.6.0
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.59-4
+BuildRequires: python3-rpkg >= 1.59-5
BuildRequires: python3-distro
# This until fedora-cert gets fixed
BuildRequires: python3-fedora
@@ -100,7 +93,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.59-4
+Requires: python3-rpkg >= 1.59-5
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -170,6 +163,39 @@ nosetests
%changelog
+* Mon Mar 02 2020 Ondřej Nosek <onosek@redhat.com> - 1.38-1
+- Removes check of bodhi-client version - rhbz#1796972 (onosek)
+- Clone config customization for namespaces (onosek)
+- Repair Jenkins tests (onosek)
+- Update bash completion with side tag commands (lsedlar)
+- add --fail-fast to bash-completion (cheese)
+- Improve coding style by sorting imports (onosek)
+- Repair tests for previous commits (onosek)
+- Create fork of the active repository - #276 (onosek)
+- request-tests-repo: add branch into ticket body - #359 (onosek)
+- verrel command on master asks Koji first - #357 (onosek)
+- Check nvr before build - #356 (onosek)
+- Change dist tag for epel8-playground (onosek)
+- Add test for retiring on archived release (lsedlar)
+- Mock requests in all tests (lsedlar)
+- Line up descriptions for better code readability (onosek)
+- Clarify request-branch 'service levels' argument - #283 (onosek)
+- Resolve Jenkins unittests failing (onosek)
+- utils: fix whitespace in Pagure error message (kdreyer)
+- New options for bodhi template - 459 (onosek)
+- Block retiring in released branches - #337 (onosek)
+- Use package.cfg for epel8+ branches (mboddu)
+- Add epel*-playground into rpmdefines (smooge)
+- linux_distribution import moved (onosek)
+- Unittests for epel*-playground branch requests (onosek)
+- Allow epel*-playground requests for epel8 and newer (onosek)
+- Support for epel*-playground branch requests - #334 (mboddu)
+- git-changelog: Fix running on Python 3 (onosek)
+- Avoid warning about invalid escape with python3.8 (zbyszek)
+- Tests for update stable karma - #321 (cqi)
+- Bump check for bodhi client - 330 (lsedlar)
+- Ignore files in a cloned repository - patterns update (onosek)
+
* Mon Feb 03 2020 Ondřej Nosek <onosek@redhat.com> - 1.37-13
- Patch: Removes check of bodhi-client version
diff --git a/sources b/sources
index 6e185d8..d78c737 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.37.tar.bz2) = 74dbd810a4d192a91ace8caec5e662437a26d0a24440b61a950273543525d13552f8acacd5ed8eced6df642ea7cd75a80a80d39d7ac9648f028438f0f1663479
+SHA512 (fedpkg-1.38.tar.bz2) = 07b6cd28dc4a44cca5b16b1b2016175f61a617cbba5677a41ba2c50fa8d7c86199d60a3092b3566a9bf4dda3313cf367fcda58fe0db7ff1a2867210df8ab35d3
^ permalink raw reply related [flat|nested] 2+ messages in thread* [rpms/fedpkg] 1.48-1: New release 1.38
@ 2026-08-10 21:45
0 siblings, 0 replies; 2+ messages in thread
From: @ 2026-08-10 21:45 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/fedpkg
Branch : 1.48-1
Commit : e044c57d8566893234db9a23ba0669cac7597c7a
Author : Ondřej Nosek <onosek@redhat.com>
Date : 2020-03-02T22:37:26+00:00
Stats : +42/-318 in 9 file(s)
URL : https://src.fedoraproject.org/rpms/fedpkg/c/e044c57d8566893234db9a23ba0669cac7597c7a?branch=1.48-1
Log:
New release 1.38
Signed-off-by: Ondřej Nosek <onosek@redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 6bf0b86..e29498e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/fedpkg-1.35.tar.bz2
/fedpkg-1.36.tar.bz2
/fedpkg-1.37.tar.bz2
+/fedpkg-1.38.tar.bz2
diff --git a/0001-Bump-check-for-bodhi-client.patch b/0001-Bump-check-for-bodhi-client.patch
deleted file mode 100644
index 9a77448..0000000
--- a/0001-Bump-check-for-bodhi-client.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b78a5ee21f5bd9d07aa2ace7177ac0f49ee11c06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Fri, 31 May 2019 09:36:10 +0200
-Subject: [PATCH] Bump check for bodhi client
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There should be no change on the client for what fedpkg is using.
-
-Fixes: https://pagure.io/fedpkg/issue/330
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- fedpkg/cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index e8ebe4a..d7b0872 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -84,7 +84,7 @@ def check_bodhi_version():
- except pkg_resources.DistributionNotFound:
- raise rpkgError('bodhi-client < 2.0 is not supported.')
- major = int(dist.version.split('.', 1)[0])
-- if major >= 4:
-+ if major >= 5:
- raise rpkgError(
- 'This system has bodhi v{0}, which is unsupported.'.format(major))
-
---
-2.20.1
-
diff --git a/0002-Support-for-epel-playground-branch-requests.patch b/0002-Support-for-epel-playground-branch-requests.patch
deleted file mode 100644
index 7f07f0c..0000000
--- a/0002-Support-for-epel-playground-branch-requests.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From eabb5ae7dd0495f67b73d76137df78b84e2792ec Mon Sep 17 00:00:00 2001
-From: Mohan Boddu <mboddu@bhujji.com>
-Date: Tue, 9 Jul 2019 22:07:06 -0400
-Subject: [PATCH 1/2] Support for epel*-playground branch requests
-
-Fixes: #334
-JIRA: COMPOSE-3677
-Merges: https://pagure.io/fedpkg/pull-request/336
-
-Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
----
- fedpkg/cli.py | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index d7b0872..1732a22 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -904,10 +904,26 @@ targets to build the package for a particular stream.
- 'a git repository')
-
- pdc_url = config.get('{0}.pdc'.format(name), 'url')
-+ # When a 'epel\d' branch is requested, it should automatically request
-+ # 'epel\d+-playground' branch.
-+ epel_playground = False
-+ epel_version = None
- if branch:
-+ # Check if the requested branch is an epel branch
-+ match = re.match(r'^epel(?P<epel_version>\d+)$', branch)
-+ if match:
-+ epel_playground = True
-+ epel_version = int(match.groupdict()["epel_version"])
-+
- if is_epel(branch):
- assert_valid_epel_package(repo_name, branch)
-
-+ # Requesting epel\d-playground branches is not allowed
-+ if bool(re.match(r'^epel\d+-playground$', branch)):
-+ raise rpkgError(
-+ 'You cannot directly request {0} branch, as they are '
-+ 'created as part of epel branch requests'.format(branch))
-+
- if ns in ['modules', 'test-modules', 'flatpaks']:
- branch_valid = bool(re.match(r'^[a-zA-Z0-9.\-_+]+$', branch))
- if not branch_valid:
-@@ -941,6 +957,11 @@ targets to build the package for a particular stream.
- *list(get_release_branches(pdc_url).values())))
- branches = [b for b in release_branches
- if re.match(r'^(f\d+)$', b)]
-+ # If the requested branch is epel branch then also add epel\d+-playground branch
-+ # to the request list.
-+ # TODO: Remove the check for epel version >= 7 when we enable playground for epel7
-+ elif epel_playground and epel_version >= 7:
-+ branches = [branch, branch+"-playground"]
- else:
- branches = [branch]
-
-@@ -968,6 +989,7 @@ targets to build the package for a particular stream.
- auto_module = (
- ns == 'rpms'
- and not re.match(RELEASE_BRANCH_REGEX, b)
-+ and not epel_playground # Dont run auto_module on epel requests
- and not no_auto_module
- )
- if auto_module:
---
-2.20.1
-
diff --git a/0003-Allow-epel-playground-requests-for-epel8-and-newer.patch b/0003-Allow-epel-playground-requests-for-epel8-and-newer.patch
deleted file mode 100644
index 06c175d..0000000
--- a/0003-Allow-epel-playground-requests-for-epel8-and-newer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f97d06c785a837ed860a20660ac6344ec546802c Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Thu, 18 Jul 2019 10:01:27 +0200
-Subject: [PATCH 2/2] Allow epel*-playground requests for epel8 and newer
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- fedpkg/cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index 1732a22..8e73f0f 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -960,7 +960,7 @@ targets to build the package for a particular stream.
- # If the requested branch is epel branch then also add epel\d+-playground branch
- # to the request list.
- # TODO: Remove the check for epel version >= 7 when we enable playground for epel7
-- elif epel_playground and epel_version >= 7:
-+ elif epel_playground and epel_version >= 8:
- branches = [branch, branch+"-playground"]
- else:
- branches = [branch]
---
-2.20.1
-
diff --git a/0004-Add-epel-playground-into-rpmdefines.patch b/0004-Add-epel-playground-into-rpmdefines.patch
deleted file mode 100644
index f848967..0000000
--- a/0004-Add-epel-playground-into-rpmdefines.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 27366b3e35008d0ffef6986555693b1874586795 Mon Sep 17 00:00:00 2001
-From: Stephen Smoogen <smooge@gmail.com>
-Date: Mon, 22 Jul 2019 13:04:30 -0400
-Subject: [PATCH] Add epel*-playground into rpmdefines
-
-Signed-off-by: Stephen Smoogen <smooge@gmail.com>
-Merges: https://pagure.io/fedpkg/pull-request/343
----
- fedpkg/__init__.py | 7 +++++++
- test/test_commands.py | 15 +++++++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index f66cb12..fd050e6 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -141,6 +141,13 @@ class Commands(pyrpkg.Commands):
- self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch)
- self.override = 'epel%s-override' % self._distval
- self._distunset = 'fedora'
-+ elif re.match(r'epel\d+-playground$', self.branch_merge):
-+ self._distval = re.search(r'\d+', self.branch_merge).group(0)
-+ self._distvar = 'rhel'
-+ self._disttag = 'el%s_playground' % self._distval
-+ self.mockconfig = 'epel-%s-%s' % (self._distval, self.localarch)
-+ self.override = 'epel%s-override' % self._distval
-+ self._distunset = 'fedora'
- elif re.match(r'olpc\d$', self.branch_merge):
- self._distval = self.branch_merge.split('olpc')[1]
- self._distvar = 'olpc'
-diff --git a/test/test_commands.py b/test/test_commands.py
-index 7824f9f..ebf4a3f 100644
---- a/test/test_commands.py
-+++ b/test/test_commands.py
-@@ -245,6 +245,21 @@ class TestLoadRpmDefines(CommandTestCase):
-
- self.assert_rpmdefines()
-
-+ @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
-+ def test_load_epel8_playground_dist_tag(self, branch_merge):
-+ branch_merge.return_value = 'epel8-playground'
-+
-+ self.cmd.load_rpmdefines()
-+
-+ self.assertEqual('8', self.cmd._distval)
-+ self.assertEqual('rhel', self.cmd._distvar)
-+ self.assertEqual('el8_playground', self.cmd._disttag)
-+ self.assertEqual('epel-8-i686', self.cmd.mockconfig)
-+ self.assertEqual('epel8-override', self.cmd.override)
-+ self.assertTrue(hasattr(self.cmd, '_distunset'))
-+
-+ self.assert_rpmdefines()
-+
- @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
- @patch('fedpkg.Commands._findmasterbranch')
- def test_load_master_dist_tag(self, _findmasterbranch, branch_merge):
---
-2.21.0
-
diff --git a/0005-Use-package.cfg-for-epel8-branches.patch b/0005-Use-package.cfg-for-epel8-branches.patch
deleted file mode 100644
index 59f2228..0000000
--- a/0005-Use-package.cfg-for-epel8-branches.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 702d68544d20e9cc3f2eb820dacb12f5fd76e8b0 Mon Sep 17 00:00:00 2001
-From: Mohan Boddu <mboddu@bhujji.com>
-Date: Fri, 26 Jul 2019 11:40:00 -0400
-Subject: [PATCH] Use package.cfg for epel8+ branches
-
-Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
-Merges: https://pagure.io/fedpkg/pull-request/348
----
- fedpkg/utils.py | 28 +++++++++++++++++++++++-----
- test/test_utils.py | 4 +++-
- 2 files changed, 26 insertions(+), 6 deletions(-)
-
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index ea25439..fcaa6ec 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -350,11 +350,25 @@ def get_stream_branches(server_url, package_name):
- # Please remember to review the data regularly, there are only stream
- # branches, or some new replacement of PDC fixes the issue as well, it
- # should be ok to remove if from this list.
-- return [
-- item for item in branches
-- if not re.match(r'^(f|el|epel)\d+$', item['name']) and
-- item['name'] != 'master'
-- ]
-+ stream_branches = []
-+ for item in branches:
-+ if item['name'] == 'master':
-+ continue
-+ elif re.match(r'^(f|el)\d+$', item['name']):
-+ continue
-+ # epel7 is regular release branch
-+ # epel8 and above should be considered a stream branch to use
-+ # package.cfg file in the branch.
-+ elif 'epel7' == item['name']:
-+ continue
-+ # epel8-playground and above playground branches should be considered
-+ # as release branches so that it will use epelX-playground-candidate
-+ # target to build.
-+ elif re.match(r'^epel\d+-playground$', item['name']):
-+ continue
-+ else:
-+ stream_branches.append(item)
-+ return stream_branches
-
-
- def expand_release(rel, active_releases):
-@@ -379,5 +393,9 @@ def expand_release(rel, active_releases):
- return active_releases['epel']
- elif rel in active_releases['fedora'] or rel in active_releases['epel']:
- return [rel]
-+ # if epelX-playground branch then return the release to use
-+ # epelX-playground-candidate target
-+ elif re.match(r'^epel\d+-playground$', rel):
-+ return [rel]
- else:
- return None
-diff --git a/test/test_utils.py b/test/test_utils.py
-index 74db227..1ee4ce8 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -468,13 +468,15 @@ class TestGetStreamBranches(unittest.TestCase):
- {'name': 'f28'},
- {'name': 'epel7'},
- {'name': 'master'},
-+ {'name': 'epel8'},
-+ {'name': 'epel8-playground'}
- ],
- 'next': None
- }
- get.return_value = rv
-
- result = utils.get_stream_branches('http://localhost/', 'pkg')
-- self.assertEqual([{'name': '8'}, {'name': '10'}], list(result))
-+ self.assertEqual([{'name': '8'}, {'name': '10'}, {'name': 'epel8'}], list(result))
-
-
- class TestExpandRelease(unittest.TestCase):
---
-2.21.0
-
diff --git a/0007-Removes-check-of-bodhi-client-version.patch b/0007-Removes-check-of-bodhi-client-version.patch
deleted file mode 100644
index a2c56f8..0000000
--- a/0007-Removes-check-of-bodhi-client-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 183f6f30ac7a8183dd253b0d6a5145b6ad4ebade Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Mon, 3 Feb 2020 16:16:43 +0100
-Subject: [PATCH] Removes check of bodhi-client version
-
-Modification of this part of the code is not needed now when a new
-major version of Bodhi is released (if there are not incompatibilities
-with previous Bodhi version).
-
-Fixes: rhbz#1796972
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- fedpkg/cli.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index ebf3a88..e2291ff 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -87,13 +87,9 @@ require_testcases=%(require_testcases)s
-
- def check_bodhi_version():
- try:
-- dist = pkg_resources.get_distribution('bodhi_client')
-+ pkg_resources.get_distribution('bodhi_client')
- except pkg_resources.DistributionNotFound:
- raise rpkgError('bodhi-client < 2.0 is not supported.')
-- major = int(dist.version.split('.', 1)[0])
-- if major >= 5:
-- raise rpkgError(
-- 'This system has bodhi v{0}, which is unsupported.'.format(major))
-
-
- class fedpkgClient(cliClient):
---
-2.21.1
-
diff --git a/fedpkg.spec b/fedpkg.spec
index 33c6c55..ebc4a88 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,8 +4,8 @@
%endif
Name: fedpkg
-Version: 1.37
-Release: 13%{?dist}
+Version: 1.38
+Release: 1%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -13,13 +13,7 @@ URL: https://pagure.io/fedpkg
Source0: https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
BuildArch: noarch
-Patch0: 0001-Bump-check-for-bodhi-client.patch
-Patch1: 0002-Support-for-epel-playground-branch-requests.patch
-Patch2: 0003-Allow-epel-playground-requests-for-epel8-and-newer.patch
-Patch3: 0004-Add-epel-playground-into-rpmdefines.patch
-Patch4: 0005-Use-package.cfg-for-epel8-branches.patch
-Patch5: 0006-display_name-added-to-bodhi.template.patch
-Patch6: 0007-Removes-check-of-bodhi-client-version.patch
+Patch1: 0006-display_name-added-to-bodhi.template.patch
# fedpkg command switched to python3 on Fedora 29 and RHEL > 7:
%if 0%{?fedora} > 28 || 0%{?rhel} > 7
@@ -42,7 +36,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.59-4
+BuildRequires: python2-rpkg >= 1.59-5
BuildRequires: python2-distro
# This until fedora-cert gets fixed
BuildRequires: python2-fedora
@@ -75,7 +69,7 @@ BuildRequires: python2-bugzilla
Requires: python2-bugzilla
%endif
-Requires: python2-rpkg >= 1.59-4
+Requires: python2-rpkg >= 1.59-5
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -86,7 +80,7 @@ Requires: python2-openidc-client >= 0.6.0
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.59-4
+BuildRequires: python3-rpkg >= 1.59-5
BuildRequires: python3-distro
# This until fedora-cert gets fixed
BuildRequires: python3-fedora
@@ -100,7 +94,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.59-4
+Requires: python3-rpkg >= 1.59-5
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -170,6 +164,39 @@ nosetests
%changelog
+* Mon Mar 02 2020 Ondřej Nosek <onosek@redhat.com> - 1.38-1
+- Removes check of bodhi-client version - rhbz#1796972 (onosek)
+- Clone config customization for namespaces (onosek)
+- Repair Jenkins tests (onosek)
+- Update bash completion with side tag commands (lsedlar)
+- add --fail-fast to bash-completion (cheese)
+- Improve coding style by sorting imports (onosek)
+- Repair tests for previous commits (onosek)
+- Create fork of the active repository - #276 (onosek)
+- request-tests-repo: add branch into ticket body - #359 (onosek)
+- verrel command on master asks Koji first - #357 (onosek)
+- Check nvr before build - #356 (onosek)
+- Change dist tag for epel8-playground (onosek)
+- Add test for retiring on archived release (lsedlar)
+- Mock requests in all tests (lsedlar)
+- Line up descriptions for better code readability (onosek)
+- Clarify request-branch 'service levels' argument - #283 (onosek)
+- Resolve Jenkins unittests failing (onosek)
+- utils: fix whitespace in Pagure error message (kdreyer)
+- New options for bodhi template - 459 (onosek)
+- Block retiring in released branches - #337 (onosek)
+- Use package.cfg for epel8+ branches (mboddu)
+- Add epel*-playground into rpmdefines (smooge)
+- linux_distribution import moved (onosek)
+- Unittests for epel*-playground branch requests (onosek)
+- Allow epel*-playground requests for epel8 and newer (onosek)
+- Support for epel*-playground branch requests - #334 (mboddu)
+- git-changelog: Fix running on Python 3 (onosek)
+- Avoid warning about invalid escape with python3.8 (zbyszek)
+- Tests for update stable karma - #321 (cqi)
+- Bump check for bodhi client - 330 (lsedlar)
+- Ignore files in a cloned repository - patterns update (onosek)
+
* Mon Feb 03 2020 Ondřej Nosek <onosek@redhat.com> - 1.37-13
- Patch: Removes check of bodhi-client version
diff --git a/sources b/sources
index 6e185d8..d78c737 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.37.tar.bz2) = 74dbd810a4d192a91ace8caec5e662437a26d0a24440b61a950273543525d13552f8acacd5ed8eced6df642ea7cd75a80a80d39d7ac9648f028438f0f1663479
+SHA512 (fedpkg-1.38.tar.bz2) = 07b6cd28dc4a44cca5b16b1b2016175f61a617cbba5677a41ba2c50fa8d7c86199d60a3092b3566a9bf4dda3313cf367fcda58fe0db7ff1a2867210df8ab35d3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-08-10 21:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-10 21:45 [rpms/fedpkg] 1.48-1: New release 1.38
2026-08-10 21:45
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox