public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fedpkg] 1.48-1: New release 1.42
@ 2026-08-10 21:46
0 siblings, 0 replies; only message in thread
From: @ 2026-08-10 21:46 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/fedpkg
Branch : 1.48-1
Commit : 8b8c3c859bb9c7f075ed27096d14aba8d9de382e
Author : Ondřej Nosek <onosek@redhat.com>
Date : 2022-02-08T00:01:59+00:00
Stats : +46/-175 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/fedpkg/c/8b8c3c859bb9c7f075ed27096d14aba8d9de382e?branch=1.48-1
Log:
New release 1.42
Signed-off-by: Ondřej Nosek <onosek@redhat.com>
---
diff --git a/.gitignore b/.gitignore
index c00cd21..3754beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
/fedpkg-1.39.tar.bz2
/fedpkg-1.40.tar.bz2
/fedpkg-1.41.tar.bz2
+/fedpkg-1.42.tar.bz2
diff --git a/0002-Add-support-for-epel9-next.patch b/0002-Add-support-for-epel9-next.patch
deleted file mode 100644
index ce76f92..0000000
--- a/0002-Add-support-for-epel9-next.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 8af1152be8311963d67360d1e6a3cfaa3accf8dd Mon Sep 17 00:00:00 2001
-From: Carl George <carl@george.computer>
-Date: Fri, 1 Oct 2021 15:18:57 -0500
-Subject: [PATCH] Add support for epel9-next
-
-This modifies the assert_valid_epel_package function to check
-the CentOS Stream compose metadata to determine if a package name
-is valid for EPEL or not. A similar change was made to fedscm-admin.
-
-JIRA: RHELCMP-6846
-Relates: https://pagure.io/fedscm-admin/pull-request/72
-Merges: https://pagure.io/fedpkg/pull-request/453
-
-Signed-off-by: Carl George <carl@george.computer>
----
- fedpkg/utils.py | 106 ++++++++++++++++++++++++++++++++----------------
- 1 file changed, 71 insertions(+), 35 deletions(-)
-
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index 4671b50..cbd8268 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -339,43 +339,79 @@ def assert_valid_epel_package(name, branch):
- """
- # Extract any digits in the branch name to determine the EL version
- version = ''.join([i for i in branch if re.match(r'\d', i)])
-- url = ('https://infrastructure.fedoraproject.org/repo/json/pkg_el{0}.json'
-- .format(version))
-- error_msg = ('The connection to infrastructure.fedoraproject.org failed '
-- 'while trying to determine if this is a valid EPEL package.')
-- try:
-- rv = requests.get(url, timeout=60)
-- except ConnectionError as error:
-- error_msg += ' The error was: {0}'.format(str(error))
-- raise rpkgError(error_msg)
-
-- if not rv.ok:
-- raise rpkgError(error_msg + ' The status code was: {0}'.format(
-- rv.status_code))
-+ # Starting with epel9 and epel9-next, check against CentOS compose metadata.
-+ if int(version) >= 9:
-+ # Currently we only have a latest symlink. In the future we'll need
-+ # separate latest symlinks that include the major version.
-+ # https://bugzilla.redhat.com/show_bug.cgi?id=2005139
-+ url = 'https://composes.stream.centos.org/production/' \
-+ 'latest-CentOS-Stream/compose/metadata/rpms.json'
-+ error_msg = ('The connection to composes.stream.centos.org failed while '
-+ 'trying to determine if this is a valid EPEL package.')
-+ try:
-+ rv = requests.get(url, timeout=60)
-+ except ConnectionError as error:
-+ error_msg += ' The error was: {0}'.format(str(error))
-+ raise rpkgError(error_msg)
-+ if not rv.ok:
-+ raise rpkgError(error_msg + ' The status code was: {0}'.format(
-+ rv.status_code))
-
-- rv_json = rv.json()
-- # Remove noarch from this because noarch is treated specially
-- all_arches = set(rv_json['arches']) - set(['noarch'])
-- # On EL6, also remove ppc and i386 as many packages will
-- # have these arches missing and cause false positives
-- if int(version) == 6:
-- all_arches = all_arches - set(['ppc', 'i386'])
-- # On EL7 and later, also remove ppc and i686 as many packages will
-- # have these arches missing and cause false positives
-- elif int(version) >= 7:
-- all_arches = all_arches - set(['ppc', 'i686'])
--
-- error_msg_two = (
-- 'This package is already an EL package and is built on all supported '
-- 'arches, therefore, it cannot be in EPEL. If this is a mistake or you '
-- 'have an exception, please contact the Release Engineering team.')
-- for pkg_name, pkg_info in rv_json['packages'].items():
-- # If the EL package is noarch only or is available on all supported
-- # arches, then don't allow an EPEL branch
-- if pkg_name == name:
-- pkg_arches = set(pkg_info['arch'])
-- if pkg_arches == set(['noarch']) or not (all_arches - pkg_arches):
-- raise rpkgError(error_msg_two)
-+ rv_json = rv.json()
-+ pkg_names = {
-+ # convert name-epoch:version-release.arch key to just the name
-+ nevra.rsplit('.', maxsplit=1)[0].rsplit('-', maxsplit=2)[0]
-+ # only packages from these repos are forbidden in epel
-+ for repo in ['BaseOS', 'AppStream', 'CRB']
-+ for arch in rv_json['payload']['rpms'][repo].keys()
-+ for nevra in rv_json['payload']['rpms'][repo][arch].keys()
-+ }
-+ error_msg_two = (
-+ 'This package is already an EL package, therefore it cannot be in '
-+ 'EPEL. If this is a mistake or you have an exception, please '
-+ 'contact the Release Engineering team.')
-+ if name in pkg_names:
-+ raise rpkgError(error_msg_two)
-+
-+ else:
-+ url = ('https://infrastructure.fedoraproject.org/repo/json/pkg_el{0}.json'
-+ .format(version))
-+ error_msg = ('The connection to infrastructure.fedoraproject.org failed '
-+ 'while trying to determine if this is a valid EPEL package.')
-+ try:
-+ rv = requests.get(url, timeout=60)
-+ except ConnectionError as error:
-+ error_msg += ' The error was: {0}'.format(str(error))
-+ raise rpkgError(error_msg)
-+
-+ if not rv.ok:
-+ raise rpkgError(error_msg + ' The status code was: {0}'.format(
-+ rv.status_code))
-+
-+ rv_json = rv.json()
-+ # Remove noarch from this because noarch is treated specially
-+ all_arches = set(rv_json['arches']) - set(['noarch'])
-+ # On EL6, also remove ppc and i386 as many packages will
-+ # have these arches missing and cause false positives
-+ if int(version) == 6:
-+ all_arches = all_arches - set(['ppc', 'i386'])
-+ # On EL7 and later, also remove ppc and i686 as many packages will
-+ # have these arches missing and cause false positives
-+ elif int(version) >= 7:
-+ all_arches = all_arches - set(['ppc', 'i686'])
-+
-+ error_msg_two = (
-+ 'This package is already an EL package and is built on all supported '
-+ 'arches, therefore, it cannot be in EPEL. If this is a mistake or you '
-+ 'have an exception, please contact the Release Engineering team.')
-+ for pkg_name, pkg_info in rv_json['packages'].items():
-+ # If the EL package is noarch only or is available on all supported
-+ # arches, then don't allow an EPEL branch
-+ if pkg_name == name:
-+ pkg_arches = set(pkg_info['arch'])
-+ if pkg_arches == set(['noarch']) or not (all_arches - pkg_arches):
-+ raise rpkgError(error_msg_two)
-
-
- def assert_new_tests_repo(name, dist_git_url):
---
-2.31.1
-
diff --git a/0002-Remove-pytest-coverage-execution.patch b/0002-Remove-pytest-coverage-execution.patch
new file mode 100644
index 0000000..639232c
--- /dev/null
+++ b/0002-Remove-pytest-coverage-execution.patch
@@ -0,0 +1,25 @@
+From 926e903db635d6e4f5dad1f0c16d9e45e097f4d6 Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Mon, 7 Feb 2022 01:26:53 +0100
+Subject: [PATCH] Remove pytest coverage execution
+
+Signed-off-by: Ondrej Nosek <onosek@redhat.com>
+---
+ setup.cfg | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index c952275..3c47304 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -5,7 +5,6 @@ test = pytest
+ formats = bztar
+
+ [tool:pytest]
+-addopts = --cov=fedpkg
+ testpaths = test
+
+ [flake8]
+--
+2.34.1
+
diff --git a/0003-Remove-pytest-coverage-execution.patch b/0003-Remove-pytest-coverage-execution.patch
deleted file mode 100644
index 446c5fa..0000000
--- a/0003-Remove-pytest-coverage-execution.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4e22dfa592ca7a39cbd90c9a02a2a536658cb027 Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Tue, 14 Dec 2021 18:55:30 +0100
-Subject: [PATCH] Remove pytest coverage execution
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- setup.cfg | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 133a7fa..8e0661e 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -6,7 +6,6 @@ formats = bztar
-
- [tool:pytest]
- cover-package = fedpkg
--addopts = --cov=fedpkg
- testpaths = test
-
- [flake8]
---
-2.31.1
-
diff --git a/fedpkg.spec b/fedpkg.spec
index ad90341..308281c 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,8 +4,8 @@
%endif
Name: fedpkg
-Version: 1.41
-Release: 4%{?dist}
+Version: 1.42
+Release: 1%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -14,9 +14,7 @@ Source0: https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
BuildArch: noarch
Patch1: 0001-Do-not-use-pytest-related-dependencies-temporarily.patch
-# https://pagure.io/fedpkg/pull-request/453
-Patch2: 0002-Add-support-for-epel9-next.patch
-Patch3: 0003-Remove-pytest-coverage-execution.patch
+Patch2: 0002-Remove-pytest-coverage-execution.patch
# RHEL7 is currently the only release that is built for Python 2.
%if 0%{?fedora} || 0%{?rhel} > 7
@@ -39,7 +37,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.63-1
+BuildRequires: python2-rpkg >= 1.64-1
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +51,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.63-1
+Requires: python2-rpkg >= 1.64-1
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -64,7 +62,7 @@ Requires: python2-openidc-client >= 0.6.0
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.63-1
+BuildRequires: python3-rpkg >= 1.64-1
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +75,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.63-1
+Requires: python3-rpkg >= 1.64-1
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -146,6 +144,18 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Jan 26 2022 Ondřej Nosek <onosek@redhat.com> - 1.42-1
+- Fix Jenkins tests (onosek)
+- Return bash-completion back because of compatibility (onosek)
+- Fix unittests for Python 2 - missing dependency (onosek)
+- set-distgit-token: create a missing config file (mark.e.fuller)
+- Fix rsplit() usage to work with Python 2.7 - 2029175 (treydock)
+- mockbuild: default to use the local Mock configuration (praiskup)
+- Add support for epel9-next (carl)
+- Remove unused import from setup.py (onosek)
+- Enable Python argcomplete (onosek)
+- Test and support Python 3.10 (miro)
+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.41-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 81441f5..b1adc43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.41.tar.bz2) = f04f7960c48fc3f3ee59bc815d2fa5a31eea35d4d236b5a0bceb399f0bbe0017bfd2f3559c8c106a01a5c20010829fb7fa1fe19f28e2fae24f073f96f150052e
+SHA512 (fedpkg-1.42.tar.bz2) = 9dc5c6819ff065e64a0a3a736dcb82b5c0ce4ed2d3dbf6e4b8ed92dd21332bdf9b6a29c86009ffb18a12974909e823ba991a1805ea3b8bc81472a0f763a4708c
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-10 21:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-10 21:46 [rpms/fedpkg] 1.48-1: New release 1.42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox