public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/fedpkg] 1.48-1: New release 1.41
Date: Mon, 10 Aug 2026 21:45:59 GMT [thread overview]
Message-ID: <178639835938.1.5219925146908260289.rpms-fedpkg-62634d77761c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedpkg
Branch : 1.48-1
Commit : 62634d77761c874257e42f78582a7e133c9f044f
Author : Ondřej Nosek <onosek@redhat.com>
Date : 2021-08-25T08:44:44+00:00
Stats : +33/-827 in 10 file(s)
URL : https://src.fedoraproject.org/rpms/fedpkg/c/62634d77761c874257e42f78582a7e133c9f044f?branch=1.48-1
Log:
New release 1.41
Signed-off-by: Ondřej Nosek <onosek@redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 5cc9960..c00cd21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
/fedpkg-1.38.tar.bz2
/fedpkg-1.39.tar.bz2
/fedpkg-1.40.tar.bz2
+/fedpkg-1.41.tar.bz2
diff --git a/0002-Fedpkg-update-didn-t-read-bug-numbers-from-changelog.patch b/0002-Fedpkg-update-didn-t-read-bug-numbers-from-changelog.patch
deleted file mode 100644
index 36b5667..0000000
--- a/0002-Fedpkg-update-didn-t-read-bug-numbers-from-changelog.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 87e4a22aa965ad625ba063e81f03f3db87119e1a Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Mon, 11 Jan 2021 03:59:51 +0100
-Subject: [PATCH 1/3] Fedpkg update didn't read bug numbers from changelog
-
-Fixes the regular expression by accepting whitespaces at the beginning
-of the pattern which finds bug numbers.
-
-JIRA: RHELCMP-3685
-Resolves: rhbz#1912555
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- fedpkg/cli.py | 2 +-
- test/test_cli.py | 9 +++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index 18a683f..c6ccd95 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -703,7 +703,7 @@ class fedpkgClient(cliClient):
- id_pattern_raw = r'(?:fedora|epel|rh(?:bz)?)#(\d{5,})'
- bz_pattern = re.compile(
- # says: there is at least one complete (including prefix) Bugzilla bug occurrence
-- r'(?:fix(?:es)?|close(?:s)?|resolve(?:s)?)(?::|:\s+|\s+)' + id_pattern_raw,
-+ r'\s*(?:fix(?:es)?|close(?:s)?|resolve(?:s)?)(?::|:\s+|\s+)' + id_pattern_raw,
- re.IGNORECASE,
- )
- id_pattern = re.compile(id_pattern_raw, re.IGNORECASE)
-diff --git a/test/test_cli.py b/test/test_cli.py
-index 08bd7eb..b816558 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -123,8 +123,9 @@ class TestUpdate(CliTestCase):
- 'New command update - #1000', # invalid bug id format
- 'Fix tests - #2000, #notabug', # both invalid bug id format
- '处理一些Unicode字符číář',
-- 'fix: rh#10001'
-- 'Fixes: rhbz#20001'
-+ 'fix: rh#10001',
-+ 'Fixes: rhbz#20001',
-+ ' close: fedora#30001', # test whitespace at the beginning
- ]))
- clog_file = os.path.join(self.cloned_repo_path, 'clog')
- with io.open(clog_file, 'w', encoding='utf-8') as f:
-@@ -190,7 +191,7 @@ class TestUpdate(CliTestCase):
-
- expected_data = {
- 'autokarma': 'True',
-- 'bugs': '10001,20001',
-+ 'bugs': '10001,20001,30001',
- 'display_name': six.u(''),
- 'builds': ' {0} '.format(self.mock_nvr.return_value),
- 'close_bugs': True,
-@@ -228,7 +229,7 @@ class TestUpdate(CliTestCase):
- with io.open('bodhi.template', encoding='utf-8') as f:
- bodhi_template = f.read()
- self.assertTrue(self.mock_nvr.return_value in bodhi_template)
-- self.assertTrue('10001,20001' in bodhi_template)
-+ self.assertTrue('10001,20001,30001' in bodhi_template)
- if notes:
- self.assertTrue(notes.replace('\n', '\n ') in bodhi_template)
- else:
---
-2.26.2
-
diff --git a/0003-New-default-dist-git-branch-rawhide.patch b/0003-New-default-dist-git-branch-rawhide.patch
deleted file mode 100644
index 0608def..0000000
--- a/0003-New-default-dist-git-branch-rawhide.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 08a33c11754b79e190e8d469bc1067be62cee70a Mon Sep 17 00:00:00 2001
-From: Pierre-Yves Chibon <pingou@pingoured.fr>
-Date: Tue, 12 Jan 2021 21:54:23 +0100
-Subject: [PATCH 2/3] New default dist-git branch: rawhide
-
-In some places we also reference main which will be a symlink to
-the rawhide branch and we currently still reference master to be
-backward compatible (even though once the rawhide branch appears
-the master branch will be removed and blocked).
-
-Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
-Co-authored-by: Mohan Boddu <mboddu@bhujji.com>
----
- fedpkg/__init__.py | 14 +++++++-------
- fedpkg/cli.py | 12 ++++++------
- fedpkg/utils.py | 8 ++++----
- 3 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index c070416..8eecc59 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -168,9 +168,9 @@ class Commands(pyrpkg.Commands):
- "--define 'el%s 1'" % macros['rhel'],
- "--define 'rhel %s'" % macros['rhel'],
- ]
-- # master
-- elif re.match(r'master$', self.branch_merge):
-- self._distval = self._findmasterbranch()
-+ # rawhide (previously master branch)
-+ elif re.match(r'master$', self.branch_merge) or re.match(r'rawhide$', self.branch_merge) or re.match(r'main$', self.branch_merge):
-+ self._distval = self._findrawhidebranch()
- self._distvar = 'fedora'
- self._disttag = 'fc%s' % self._distval
- self.mockconfig = 'fedora-rawhide-%s' % self.localarch
-@@ -204,13 +204,13 @@ class Commands(pyrpkg.Commands):
- self._rpmdefines.extend(extra_rpmdefines)
-
- def build_target(self, release):
-- if release == 'master':
-+ if release in ('rawhide', 'main', 'master'):
- return 'rawhide'
- else:
- return '%s-candidate' % release
-
- def load_container_build_target(self):
-- if self.branch_merge == 'master':
-+ if self.branch_merge in ('rawhide', 'main', 'master'):
- self._container_build_target = 'rawhide-%s-candidate' % self.ns
- else:
- super(Commands, self).load_container_build_target()
-@@ -244,8 +244,8 @@ class Commands(pyrpkg.Commands):
-
- return macros
-
-- def _findmasterbranch(self):
-- """Find the right "fedora" for master"""
-+ def _findrawhidebranch(self):
-+ """Find the right "fedora" for rawhide (previously master branch)"""
-
- # If we already have a koji session, just get data from the source
- if self._kojisession:
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index c6ccd95..1d790ee 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -110,7 +110,7 @@ class fedpkgClient(cliClient):
- opt_release = self.parser._option_string_actions['--release']
- opt_release.help = 'Override the discovered release, e.g. f25, which has to match ' \
- 'the remote branch name created in package repository. ' \
-- 'Particularly, use master to build RPMs for rawhide.'
-+ 'Particularly, use rawhide/main branch to build RPMs for rawhide.'
-
- def setup_fed_subparsers(self):
- """Register the fedora specific targets"""
-@@ -622,7 +622,7 @@ class fedpkgClient(cliClient):
- is named package.cfg in INI format. For example,
-
- [koji]
-- targets = master fedora epel7
-+ targets = rawhide fedora epel7
-
- You only need to put Fedora releases and EPEL in option targets and fedpkg will
- convert it to proper Koji build target for submitting builds. Beside regular
-@@ -818,7 +818,7 @@ class fedpkgClient(cliClient):
- logger=self.log,
- repo_name=self.args.name,
- ns=self.args.new_repo_namespace,
-- branch='master',
-+ branch='rawhide',
- summary=self.args.summary,
- description=self.args.description,
- upstreamurl=self.args.upstreamurl,
-@@ -863,7 +863,7 @@ class fedpkgClient(cliClient):
- :param config: A dict containing the configuration, loaded from file.
- Typically the value of `self.config`.
- :param branch: The git branch string when requesting a repo.
-- Typically 'master'.
-+ Typically 'rawhide'.
- :param summary: A string, the summary of the new repo. Typically
- takes the value of `self.args.summary`.
- :param upstreamurl: A string, the upstreamurl of the new repo.
-@@ -912,7 +912,7 @@ class fedpkgClient(cliClient):
-
- ticket_body = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': bug or '',
- 'monitor': 'no-monitoring',
- 'namespace': 'tests',
-@@ -1097,7 +1097,7 @@ class fedpkgClient(cliClient):
- logger=logger,
- repo_name=repo_name,
- ns='modules',
-- branch='master',
-+ branch='rawhide',
- summary=summary,
- description=summary,
- upstreamurl=None,
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index 2c790c7..6bf3d0a 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -430,13 +430,13 @@ def get_stream_branches(server_url, package_name):
- branches = query_pdc(
- server_url, 'component-branches', params=query_args)
- # When write this method, endpoint component-branches contains not only
-- # stream branches, but also regular release branches, e.g. master, f28.
-+ # stream branches, but also regular release branches, e.g. rawhide/main, f28.
- # 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.
- stream_branches = []
- for item in branches:
-- if item['name'] == 'master':
-+ if item['name'] in ('master', 'rawhide', 'main'):
- continue
- elif re.match(r'^(f|el)\d+$', item['name']):
- continue
-@@ -469,8 +469,8 @@ def expand_release(rel, active_releases):
- returned from `get_release_branches`.
- :return: list of releases, for example ``[f28]``, or ``[el6, epel7]``.
- """
-- if rel == 'master':
-- return ['master']
-+ if rel in ('master', 'rawhide', 'main'):
-+ return ['rawhide']
- elif rel == 'fedora':
- return active_releases['fedora']
- elif rel == 'epel':
---
-2.26.2
-
diff --git a/0004-New-default-dist-git-branch-rawhide-unittests.patch b/0004-New-default-dist-git-branch-rawhide-unittests.patch
deleted file mode 100644
index 37e1abb..0000000
--- a/0004-New-default-dist-git-branch-rawhide-unittests.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From 34a971b2b85a260e8df129a0ed2e2472edb29d3e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Wed, 13 Jan 2021 10:13:38 +0100
-Subject: [PATCH 3/3] New default dist-git branch: rawhide - unittests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
-Co-authored-by: Mohan Boddu <mboddu@bhujji.com>
-
-Merges: https://pagure.io/fedpkg/pull-request/424
----
- fedpkg/__init__.py | 2 +-
- test/test_cli.py | 18 +++++++++---------
- test/test_commands.py | 20 ++++++++++----------
- test/test_utils.py | 6 +++++-
- 4 files changed, 25 insertions(+), 21 deletions(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index 8eecc59..2ec2d6e 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -169,7 +169,7 @@ class Commands(pyrpkg.Commands):
- "--define 'rhel %s'" % macros['rhel'],
- ]
- # rawhide (previously master branch)
-- elif re.match(r'master$', self.branch_merge) or re.match(r'rawhide$', self.branch_merge) or re.match(r'main$', self.branch_merge):
-+ elif re.match(r'(master|rawhide|main)$', self.branch_merge):
- self._distval = self._findrawhidebranch()
- self._distvar = 'fedora'
- self._disttag = 'fc%s' % self._distval
-diff --git a/test/test_cli.py b/test/test_cli.py
-index b816558..a20357f 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -468,7 +468,7 @@ class TestRequestRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': 1441813,
- 'description': '',
- 'exception': False,
-@@ -505,7 +505,7 @@ class TestRequestRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': 1441813,
- 'description': '',
- 'exception': False,
-@@ -545,7 +545,7 @@ class TestRequestRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': '',
- 'description': '',
- 'exception': False,
-@@ -586,7 +586,7 @@ class TestRequestRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': 1441813,
- 'description': '',
- 'exception': False,
-@@ -627,7 +627,7 @@ class TestRequestRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': 1441813,
- 'description': 'a description',
- 'exception': False,
-@@ -663,7 +663,7 @@ class TestRequestRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': '',
- 'description': '',
- 'exception': True,
-@@ -1192,7 +1192,7 @@ class TestRequestBranch(CliTestCase):
- summary = u'Automatically requested module for rpms/nethack:9.'
- expected_issue_content = {
- u'action': u'new_repo',
-- u'branch': u'master',
-+ u'branch': u'rawhide',
- u'bug_id': u'',
- u'description': summary,
- u'exception': True,
-@@ -1481,7 +1481,7 @@ class TestRequestTestsRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'master',
-+ 'branch': 'rawhide',
- 'bug_id': '',
- 'monitor': 'no-monitoring',
- 'namespace': 'tests',
-@@ -2189,7 +2189,7 @@ class TestReadReleasesFromLocalConfig(CliTestCase):
-
- rels = cli.read_releases_from_local_config(self.active_releases)
- rels = sorted(rels)
-- self.assertEqual(['el6', 'epel7', 'f27', 'f28', 'master'], rels)
-+ self.assertEqual(['el6', 'epel7', 'f27', 'f28', 'rawhide'], rels)
-
-
- class TestIsStreamBranch(CliTestCase):
-diff --git a/test/test_commands.py b/test/test_commands.py
-index 3e9be98..c45d251 100644
---- a/test/test_commands.py
-+++ b/test/test_commands.py
-@@ -262,9 +262,9 @@ class TestLoadRpmDefines(CommandTestCase):
- 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):
-- _findmasterbranch.return_value = '28'
-+ @patch('fedpkg.Commands._findrawhidebranch')
-+ def test_load_master_dist_tag(self, _findrawhidebranch, branch_merge):
-+ _findrawhidebranch.return_value = '28'
- branch_merge.return_value = 'master'
-
- self.cmd.load_rpmdefines()
-@@ -324,11 +324,11 @@ class TestLoadRpmDefines(CommandTestCase):
- self.assert_rpmdefines(extra_rpmdefines)
-
-
--class TestFindMasterBranch(CommandTestCase):
-- """Test Commands._findmasterbranch"""
-+class TestFindRawhideBranch(CommandTestCase):
-+ """Test Commands._findrawhidebranch"""
-
- def setUp(self):
-- super(TestFindMasterBranch, self).setUp()
-+ super(TestFindRawhideBranch, self).setUp()
-
- self.cmd = self.make_commands()
-
-@@ -338,7 +338,7 @@ class TestFindMasterBranch(CommandTestCase):
- koji_session = kojisession.return_value
- koji_session.getBuildTarget.return_value = {'dest_tag_name': 'f28'}
-
-- result = self.cmd._findmasterbranch()
-+ result = self.cmd._findrawhidebranch()
-
- koji_session.getBuildTarget.assert_called_once_with('rawhide')
- self.assertEqual('28', result)
-@@ -352,7 +352,7 @@ class TestFindMasterBranch(CommandTestCase):
- koji_session = anon_kojisession.return_value
- koji_session.getBuildTarget.return_value = {'dest_tag_name': 'f29'}
-
-- result = self.cmd._findmasterbranch()
-+ result = self.cmd._findrawhidebranch()
-
- koji_session.getBuildTarget.assert_called_once_with('rawhide')
- self.assertEqual('29', result)
-@@ -363,7 +363,7 @@ class TestFindMasterBranch(CommandTestCase):
- # As the code shows, any error will be caught
- koji_session.getBuildTarget.side_effect = ValueError
-
-- result = self.cmd._findmasterbranch()
-+ result = self.cmd._findrawhidebranch()
- self.assertEqual(28, result)
-
- @patch('pyrpkg.Commands.anon_kojisession', new_callable=PropertyMock)
-@@ -378,7 +378,7 @@ class TestFindMasterBranch(CommandTestCase):
-
- six.assertRaisesRegex(
- self, rpkgError, 'Unable to find rawhide target',
-- self.cmd._findmasterbranch)
-+ self.cmd._findrawhidebranch)
-
-
- class TestOverrideBuildURL(CommandTestCase):
-diff --git a/test/test_utils.py b/test/test_utils.py
-index 9697512..939f60b 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -505,7 +505,11 @@ class TestExpandRelease(unittest.TestCase):
-
- def test_expand_master(self):
- result = utils.expand_release('master', self.releases)
-- self.assertEqual(['master'], result)
-+ self.assertEqual(['rawhide'], result)
-+
-+ def test_expand_rawhide(self):
-+ result = utils.expand_release('rawhide', self.releases)
-+ self.assertEqual(['rawhide'], result)
-
- def test_normal_release(self):
- result = utils.expand_release('f28', self.releases)
---
-2.26.2
-
diff --git a/0005-Clone-rawhide-branch-with-clone-B.patch b/0005-Clone-rawhide-branch-with-clone-B.patch
deleted file mode 100644
index e3d6d4c..0000000
--- a/0005-Clone-rawhide-branch-with-clone-B.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8cf35622253977893035d6303761fbfa92a00435 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Wed, 3 Feb 2021 15:01:23 +0100
-Subject: [PATCH] Clone rawhide branch with clone -B
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: https://pagure.io/fedpkg/issue/427
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- conf/etc/rpkg/fedpkg-stage.conf | 2 +-
- conf/etc/rpkg/fedpkg.conf | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
-index e81a1d6..bb1901c 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$|master$
-+branchre = f\d$|f\d\d$|el\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 e3089bc..aef75f4 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$|master$
-+branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
- kojiprofile = koji
- build_client = koji
- clone_config_rpms =
---
-2.29.2
-
diff --git a/0006-Default-branches-on-different-namespaces.patch b/0006-Default-branches-on-different-namespaces.patch
deleted file mode 100644
index 3bcd4a8..0000000
--- a/0006-Default-branches-on-different-namespaces.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f9530a420b255ad7ef8e228c77191312ffd16d54 Mon Sep 17 00:00:00 2001
-From: Mohan Boddu <mboddu@bhujji.com>
-Date: Wed, 24 Feb 2021 12:24:56 -0500
-Subject: [PATCH 1/2] Default branches on different namespaces
-
-Changes after the migration from 'master' branches.
-Default branches for namespaces:
- * 'rpms', 'container', 'modules' - branch 'rawhide'
- * 'flatpaks' - 'stable'
- * 'tests' - 'main'
-
-Fixes: #428
-JIRA: RHELCMP-4161
-Merges: https://pagure.io/fedpkg/pull-request/430
-
-Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
----
- fedpkg/__init__.py | 6 +++---
- fedpkg/cli.py | 5 ++++-
- fedpkg/utils.py | 4 ++--
- 3 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index 2ec2d6e..155b6d7 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -169,7 +169,7 @@ class Commands(pyrpkg.Commands):
- "--define 'rhel %s'" % macros['rhel'],
- ]
- # rawhide (previously master branch)
-- elif re.match(r'(master|rawhide|main)$', self.branch_merge):
-+ elif re.match(r'(rawhide|main)$', self.branch_merge):
- self._distval = self._findrawhidebranch()
- self._distvar = 'fedora'
- self._disttag = 'fc%s' % self._distval
-@@ -204,13 +204,13 @@ class Commands(pyrpkg.Commands):
- self._rpmdefines.extend(extra_rpmdefines)
-
- def build_target(self, release):
-- if release in ('rawhide', 'main', 'master'):
-+ if release in ('rawhide', 'main'):
- return 'rawhide'
- else:
- return '%s-candidate' % release
-
- def load_container_build_target(self):
-- if self.branch_merge in ('rawhide', 'main', 'master'):
-+ if self.branch_merge in ('rawhide', 'main'):
- self._container_build_target = 'rawhide-%s-candidate' % self.ns
- else:
- super(Commands, self).load_container_build_target()
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index 1d790ee..406151f 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -912,7 +912,7 @@ class fedpkgClient(cliClient):
-
- ticket_body = {
- 'action': 'new_repo',
-- 'branch': 'rawhide',
-+ 'branch': 'main',
- 'bug_id': bug or '',
- 'monitor': 'no-monitoring',
- 'namespace': 'tests',
-@@ -920,6 +920,9 @@ class fedpkgClient(cliClient):
- 'description': description,
- }
- else:
-+ # Default branch is rawhide, but for flatpaks namespace its 'stable'
-+ if ns == 'flatpaks':
-+ branch = 'stable'
- ticket_body = {
- 'action': 'new_repo',
- 'branch': branch,
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index 6bf3d0a..046ead3 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -436,7 +436,7 @@ def get_stream_branches(server_url, package_name):
- # should be ok to remove if from this list.
- stream_branches = []
- for item in branches:
-- if item['name'] in ('master', 'rawhide', 'main'):
-+ if item['name'] in ('rawhide', 'main'):
- continue
- elif re.match(r'^(f|el)\d+$', item['name']):
- continue
-@@ -469,7 +469,7 @@ def expand_release(rel, active_releases):
- returned from `get_release_branches`.
- :return: list of releases, for example ``[f28]``, or ``[el6, epel7]``.
- """
-- if rel in ('master', 'rawhide', 'main'):
-+ if rel in ('rawhide', 'main'):
- return ['rawhide']
- elif rel == 'fedora':
- return active_releases['fedora']
---
-2.29.2
-
diff --git a/0007-Unittests-for-new-default-branches.patch b/0007-Unittests-for-new-default-branches.patch
deleted file mode 100644
index df8b697..0000000
--- a/0007-Unittests-for-new-default-branches.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From a04ee35c6db7979792ce3a59071b7446c77b98f9 Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Tue, 2 Mar 2021 00:18:49 +0100
-Subject: [PATCH 2/2] Unittests for new default branches
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- test/fedpkg-stage.conf | 2 +-
- test/fedpkg-test.conf | 2 +-
- test/test_cli.py | 4 ++--
- test/test_commands.py | 12 ++++++------
- test/test_retire.py | 8 ++++----
- test/test_utils.py | 6 +++---
- 6 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/test/fedpkg-stage.conf b/test/fedpkg-stage.conf
-index 2f52251..49089c4 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$|master$
-+branchre = f\d$|f\d\d$|el\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 9559288..6774f31 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$|master$
-+branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
- kojiprofile = koji
- build_client = koji
- distgit_namespaced = True
-diff --git a/test/test_cli.py b/test/test_cli.py
-index a20357f..4327990 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -1481,7 +1481,7 @@ class TestRequestTestsRepo(CliTestCase):
-
- expected_issue_content = {
- 'action': 'new_repo',
-- 'branch': 'rawhide',
-+ 'branch': 'main',
- 'bug_id': '',
- 'monitor': 'no-monitoring',
- 'namespace': 'tests',
-@@ -2153,7 +2153,7 @@ class TestReadReleasesFromLocalConfig(CliTestCase):
- self.package_cfg = os.path.join(self.cloned_repo_path,
- fedpkg.cli.LOCAL_PACKAGE_CONFIG)
- self.write_file(self.package_cfg,
-- content='[koji]\ntargets=master f28 fedora epel')
-+ content='[koji]\ntargets=rawhide f28 fedora epel')
-
- @patch('os.path.exists', return_value=False)
- def test_no_config_file_is_create(self, exists):
-diff --git a/test/test_commands.py b/test/test_commands.py
-index c45d251..0c1a77d 100644
---- a/test/test_commands.py
-+++ b/test/test_commands.py
-@@ -68,8 +68,8 @@ class TestLoadTarget(CommandTestCase):
- self.cmd = self.make_commands()
-
- @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
-- def test_load_from_master(self, branch_merge):
-- branch_merge.return_value = 'master'
-+ def test_load_from_rawhide(self, branch_merge):
-+ branch_merge.return_value = 'rawhide'
-
- self.cmd.load_target()
- self.assertEqual('rawhide', self.cmd._target)
-@@ -91,9 +91,9 @@ class TestLoadContainerBuildTarget(CommandTestCase):
-
- @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
- @patch('pyrpkg.Commands.ns', new_callable=PropertyMock)
-- def test_load_from_master(self, ns, branch_merge):
-+ def test_load_from_rawhide(self, ns, branch_merge):
- ns.return_value = 'container'
-- branch_merge.return_value = 'master'
-+ branch_merge.return_value = 'rawhide'
-
- self.cmd.load_container_build_target()
- self.assertEqual('rawhide-container-candidate',
-@@ -263,9 +263,9 @@ class TestLoadRpmDefines(CommandTestCase):
-
- @patch('pyrpkg.Commands.branch_merge', new_callable=PropertyMock)
- @patch('fedpkg.Commands._findrawhidebranch')
-- def test_load_master_dist_tag(self, _findrawhidebranch, branch_merge):
-+ def test_load_rawhide_dist_tag(self, _findrawhidebranch, branch_merge):
- _findrawhidebranch.return_value = '28'
-- branch_merge.return_value = 'master'
-+ branch_merge.return_value = 'rawhide'
-
- self.cmd.load_rpmdefines()
-
-diff --git a/test/test_retire.py b/test/test_retire.py
-index f6b40cc..db30e13 100644
---- a/test/test_retire.py
-+++ b/test/test_retire.py
-@@ -75,7 +75,7 @@ class RetireTestCase(unittest.TestCase):
- @mock.patch("requests.get", new=lambda *args, **kwargs: mock.Mock(status_code=404))
- def test_retire_with_namespace(self):
- self._setup_repo('ssh://git@pkgs.example.com/rpms/fedpkg')
-- args = ['fedpkg', '--dist=master', 'retire', 'my reason']
-+ args = ['fedpkg', '--dist=rawhide', 'retire', 'my reason']
-
- client = self._fake_client(args)
- client.retire()
-@@ -86,7 +86,7 @@ class RetireTestCase(unittest.TestCase):
- @mock.patch("requests.get", new=lambda *args, **kwargs: mock.Mock(status_code=404))
- def test_retire_without_namespace(self):
- self._setup_repo('ssh://git@pkgs.example.com/fedpkg')
-- args = ['fedpkg', '--dist=master', 'retire', 'my reason']
-+ args = ['fedpkg', '--dist=rawhide', 'retire', 'my reason']
-
- client = self._fake_client(args)
- client.retire()
-@@ -100,7 +100,7 @@ class RetireTestCase(unittest.TestCase):
- with open(os.path.join(self.tmpdir, 'dead.package'), 'w') as f:
- f.write('dead package')
-
-- args = ['fedpkg', '--release=master', 'retire', 'my reason']
-+ args = ['fedpkg', '--release=rawhide', 'retire', 'my reason']
- client = self._fake_client(args)
- client.log = mock.Mock()
- client.retire()
-@@ -116,7 +116,7 @@ class RetireTestCase(unittest.TestCase):
- )
- def test_package_on_retired(self):
- self._setup_repo("ssh://git@pkgs.example.com/fedpkg")
-- args = ["fedpkg", "--dist=master", "retire", "my reason"]
-+ args = ["fedpkg", "--dist=rawhide", "retire", "my reason"]
-
- client = self._fake_client(args)
- client.retire()
-diff --git a/test/test_utils.py b/test/test_utils.py
-index 939f60b..96ad3a1 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -474,7 +474,7 @@ class TestGetStreamBranches(unittest.TestCase):
- {'name': '10'},
- {'name': 'f28'},
- {'name': 'epel7'},
-- {'name': 'master'},
-+ {'name': 'rawhide'},
- {'name': 'epel8'},
- {'name': 'epel8-playground'}
- ],
-@@ -503,8 +503,8 @@ class TestExpandRelease(unittest.TestCase):
- result = utils.expand_release('epel', self.releases)
- self.assertEqual(self.releases['epel'], result)
-
-- def test_expand_master(self):
-- result = utils.expand_release('master', self.releases)
-+ def test_expand_main(self):
-+ result = utils.expand_release('main', self.releases)
- self.assertEqual(['rawhide'], result)
-
- def test_expand_rawhide(self):
---
-2.29.2
-
diff --git a/0008-Add-support-for-epel-next-branches.patch b/0008-Add-support-for-epel-next-branches.patch
deleted file mode 100644
index 1a1b5a3..0000000
--- a/0008-Add-support-for-epel-next-branches.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 70c316b18dffc62a20fc2cf847b6c378bfb57c9e Mon Sep 17 00:00:00 2001
-From: Carl George <carl@george.computer>
-Date: Fri, 12 Feb 2021 15:56:37 -0600
-Subject: [PATCH] Add support for epel*-next branches
-
-Signed-off-by: Carl George <carl@george.computer>
----
- fedpkg/__init__.py | 7 +++++++
- fedpkg/cli.py | 7 ++++++-
- fedpkg/utils.py | 4 ++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index 155b6d7..79170b2 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -150,6 +150,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+-next$', self.branch_merge):
-+ self._distval = re.search(r'\d+', self.branch_merge).group(0)
-+ self._distvar = 'rhel'
-+ self._disttag = 'el%s.next' % 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/fedpkg/cli.py b/fedpkg/cli.py
-index 406151f..e0fe504 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -1033,8 +1033,12 @@ class fedpkgClient(cliClient):
- *list(get_release_branches(pdc_url).values())))
- # treat epel*-playground the same as epel* release branches
- playground_match = re.match(r'^(epel\d+)-playground$', branch)
-+ # treat epel*-next the same as epel* release branches
-+ next_match = re.match(r'^(epel\d+)-next$', branch)
- if playground_match:
- _branch = playground_match.groups()[0]
-+ elif next_match:
-+ _branch = next_match.groups()[0]
- else:
- _branch = branch
- if _branch in release_branches:
-@@ -1090,7 +1094,8 @@ class fedpkgClient(cliClient):
- auto_module = (
- ns == 'rpms'
- and not re.match(RELEASE_BRANCH_REGEX, b)
-- and not playground_match # Dont run auto_module on epel requests
-+ and not playground_match # Dont run auto_module on epel-playground requests
-+ and not next_match # Dont run auto_module on epel-next requests
- and not no_auto_module
- )
- if auto_module:
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index 046ead3..b7d883f 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -450,6 +450,10 @@ def get_stream_branches(server_url, package_name):
- # target to build.
- elif re.match(r'^epel\d+-playground$', item['name']):
- continue
-+ # epel8-next and above branches should be considered as release branches
-+ # so that it will use epelX-next-candidate target to build.
-+ elif re.match(r'^epel\d+-next$', item['name']):
-+ continue
- else:
- stream_branches.append(item)
- return stream_branches
---
-2.30.2
-
diff --git a/fedpkg.spec b/fedpkg.spec
index fc0a8ce..123c683 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,8 +4,8 @@
%endif
Name: fedpkg
-Version: 1.40
-Release: 8%{?dist}
+Version: 1.41
+Release: 1%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -14,13 +14,6 @@ Source0: https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
BuildArch: noarch
Patch1: 0001-Do-not-use-pytest-related-dependencies-temporarily.patch
-Patch2: 0002-Fedpkg-update-didn-t-read-bug-numbers-from-changelog.patch
-Patch3: 0003-New-default-dist-git-branch-rawhide.patch
-Patch4: 0004-New-default-dist-git-branch-rawhide-unittests.patch
-Patch5: 0005-Clone-rawhide-branch-with-clone-B.patch
-Patch6: 0006-Default-branches-on-different-namespaces.patch
-Patch7: 0007-Unittests-for-new-default-branches.patch
-Patch8: 0008-Add-support-for-epel-next-branches.patch
# RHEL7 is currently the only release that is built for Python 2.
%if 0%{?fedora} || 0%{?rhel} > 7
@@ -43,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.62-3
+BuildRequires: python2-rpkg >= 1.63-1
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -57,7 +50,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.62-3
+Requires: python2-rpkg >= 1.63-1
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -68,7 +61,7 @@ Requires: python2-openidc-client >= 0.6.0
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.62-3
+BuildRequires: python3-rpkg >= 1.63-1
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -81,7 +74,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.62-3
+Requires: python3-rpkg >= 1.63-1
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -150,6 +143,31 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Aug 25 2021 Ondřej Nosek <onosek@redhat.com> - 1.41-1
+- Look for bug number in commit message instead of changelog (zebob.m)
+- Add default configuration for `resultsdir` (oturpe)
+- Use rpkg layouts for rpmdefines (oturpe)
+- Advertised set-x-token method in do_fork and set_pagure_issue (jkunstle)
+- Pagure / DistGit token config-file cli-interface - #192 (jkunstle)
+- Deprecated arguments --dist have been removed, and related tests have been
+ updated. (abisoi)
+- Add support for epel*-next branches (carl)
+- Pagure token request - ACL specification - #440 (jkunstle)
+- request-tests-repo: add empty 'upstreamurl' item - rhbz#1854987 (onosek)
+- Jenkins unittests run in docker container (onosek)
+- Drop Python 2.6 support (onosek)
+- Bash completion for request-tests-repo - #433 (onosek)
+- Unittests for new default branches (onosek)
+- Default branches on different namespaces - #428 (mboddu)
+- Clone rawhide branch with clone -B - 427 (lsedlar)
+- Fix completion of arches (lsedlar)
+- Add --rpmlintconf to lint command completion (lsedlar)
+- Remove duplicated definition for lint (lsedlar)
+- Add fork to bash completion - 1920997 (lsedlar)
+- New default dist-git branch: rawhide - unittests (lsedlar)
+- New default dist-git branch: rawhide (pingou)
+- Fedpkg update didn't read bug numbers from changelog - rhbz#1912555 (onosek)
+
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.40-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index c472e28..81441f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.40.tar.bz2) = 891eb5bf5927115e327259b9baef806257e46d14361ba2dad5897ef3c3cbe90b252c69424c0e5da23c51e318eeb40804c7aa1bc6611fedec4c2a75c7c0291f49
+SHA512 (fedpkg-1.41.tar.bz2) = f04f7960c48fc3f3ee59bc815d2fa5a31eea35d4d236b5a0bceb399f0bbe0017bfd2f3559c8c106a01a5c20010829fb7fa1fe19f28e2fae24f073f96f150052e
reply other threads:[~2026-08-10 21:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178639835938.1.5219925146908260289.rpms-fedpkg-62634d77761c@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox