diff --git a/0001-checks-Use-GitResolver-for-scm-dicts.patch b/0001-checks-Use-GitResolver-for-scm-dicts.patch deleted file mode 100644 index 43935b23..00000000 --- a/0001-checks-Use-GitResolver-for-scm-dicts.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 258fec5e76f3f4a3b9f40bc79c2f92dad1378b31 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= -Date: Tue, 5 Mar 2019 14:45:21 +0100 -Subject: [PATCH] checks: Use GitResolver for scm dicts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise the offline flag is not honored correctly. - -Signed-off-by: Lubomír Sedlář ---- - pungi/checks.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pungi/checks.py b/pungi/checks.py -index a38db3c3..d7be16d2 100644 ---- a/pungi/checks.py -+++ b/pungi/checks.py -@@ -304,7 +304,7 @@ def _extend_with_default_and_alias(validator_class, offline=False): - # and there's a repo URL specified - and "repo" in instance[property] - ): -- instance[property]["branch"] = util.resolve_git_ref( -+ instance[property]["branch"] = resolver( - instance[property]["repo"], instance[property].get("branch", "HEAD") - ) - --- -2.17.2 - diff --git a/0001-tests-Stop-overwriting-modulesdir-for-DNF.patch b/0001-tests-Stop-overwriting-modulesdir-for-DNF.patch new file mode 100644 index 00000000..62eacee3 --- /dev/null +++ b/0001-tests-Stop-overwriting-modulesdir-for-DNF.patch @@ -0,0 +1,39 @@ +From 2286c5ccd271af7ae153d29cd5f410c020a6faa3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= +Date: Tue, 26 Mar 2019 14:08:21 +0100 +Subject: [PATCH] tests: Stop overwriting modulesdir for DNF +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Lubomír Sedlář +--- + tests/test_gather.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/tests/test_gather.py b/tests/test_gather.py +index 95b768e5..0f6814f1 100644 +--- a/tests/test_gather.py ++++ b/tests/test_gather.py +@@ -22,7 +22,6 @@ os.environ['PATH'] = '%s:%s' % (BINDIR, os.environ['PATH']) + + from pungi.wrappers.pungi import PungiWrapper + try: +- from dnf import __version__ as dnf_version + from pungi.dnf_wrapper import DnfWrapper, Conf + from pungi.gather_dnf import Gather, GatherOptions, PkgFlag + HAS_DNF = True +@@ -1819,10 +1818,6 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase): + conf = Conf(base_arch) + conf.persistdir = persistdir + conf.cachedir = self.cachedir +- if int(dnf_version.split('.')[0]) < 3: +- conf.modulesdir = os.path.join(persistdir, 'modules.d') +- else: +- conf.modulesdir._set(os.path.join(persistdir, 'modules.d')) + if exclude: + conf.exclude = exclude + dnf = DnfWrapper(conf) +-- +2.17.2 + diff --git a/pungi.spec b/pungi.spec index 14349913..265247b2 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,14 +1,14 @@ %{?python_enable_dependency_generator} Name: pungi -Version: 4.1.34 +Version: 4.1.35 Release: 1%{?dist} Summary: Distribution compose tool License: GPLv2 URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 -Patch0: 0001-checks-Use-GitResolver-for-scm-dicts.patch +Patch0: 0001-tests-Stop-overwriting-modulesdir-for-DNF.patch BuildRequires: python3-nose BuildRequires: python3-mock @@ -196,12 +196,38 @@ nosetests-3 --exe %{_bindir}/%{name}-config-dump %{_bindir}/%{name}-config-validate %{_bindir}/%{name}-fedmsg-notification +%{_bindir}/%{name}-notification-report-progress %{_bindir}/%{name}-orchestrate %{_bindir}/%{name}-patch-iso %{_bindir}/%{name}-compare-depsolving %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Tue Mar 26 2019 Lubomír Sedlář - 4.1.35-1 +- orchestrator: Monitor status of parts (lsedlar) +- tests: Skip tests if libmodulemd is not available (lsedlar) +- pkgset: Refactor hiding unused modular packages (lsedlar) +- Remove configuration for devel modules (lsedlar) +- gather: Remove module source (lsedlar) +- createrepo: Stop processing modulemd (lsedlar) +- pkgset: Load final modulemd files from Koji (lsedlar) +- buildinstall: Allow overwriting version for lorax (lsedlar) +- Create new Runroot class and use it everywhere where runroot task is + executed. (jkaluza) +- orchestrator: Send messages about the main compose (lsedlar) +- orchestrator: Support generic pre- and post- scripts (lsedlar) +- orchestrator: Support getting kerberos ticket (lsedlar) +- hybrid: Refactor handling debuginfo packages (lsedlar) +- doc: explain koji_profile (kdreyer) +- pkgset: Stop loading list of module RPMs (lsedlar) +- pkgset: Only load cache once (lsedlar) +- Do not add pkgset_koji_builds to modules, but only to pkgset_koji_tag tags. + (jkaluza) +- scm: Don't retry git fetch (lsedlar) +- tests: fix metadata tests when SOURCE_DATE_EPOCH is set (marmarek) +- checks: Use GitResolver for scm dicts (lsedlar) +- hybrid: Fix opening gzipped files on Python 2.6 (lsedlar) + * Tue Mar 05 2019 Lubomír Sedlář - 4.1.34-1 - config: Allow validating configuration in JSON (lsedlar) - image-build: Accept formats in lists (lsedlar) diff --git a/sources b/sources index b844c37e..7193ec09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pungi-4.1.34.tar.bz2) = 5713de89db22cfaf6c78079b2329d50f1639f6756184626781cc00045502f14d68995dfe14c858d05c72eb21490892e307a289c07db9cc3d2a90e265aa7d7662 +SHA512 (pungi-4.1.35.tar.bz2) = 6200a23e8fee88b7a67b771fe1189bd0ef6d37b9ee46e93ab811b712690a8ea9816b61b4a4be455d16e05d6c069d4cf8732aed9feb578e37fb8a2a5c82ab489f