From 4be067a4cd092db2d611699c4f54ca8563d61139 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 10 Mar 2016 10:30:21 -0600 Subject: [PATCH] [init] Update documentation (lsedlar) - [init] Iterate over arches just once (lsedlar) - [init] Remove duplicated checks for comps (lsedlar) - [init] Break long lines (lsedlar) - [init] Don't overwrite the same log file (lsedlar) - [init] Add config option for keeping original comps (lsedlar) - Add tests for the init phase (lsedlar) - [checks] Test printing in all cases (lsedlar) - [checks] Reduce code duplication (lsedlar) - [checks] Relax check for genisoimage (lsedlar) - [checks] Remove duplicate msgfmt line (lsedlar) - [checks] Relax check for isohybrid command (lsedlar) - [checks] Add tests for dependency checking (lsedlar) - [checks] Don't always require jigdo (lsedlar) - [pkgset] Respect inherit setting (lsedlar) - specify that the 4.0 docs are for 4.0.8 (dennis) - [live-media] Support release set to None globally (lsedlar) - include tests/fixtures/* in the tarball (dennis) Signed-off-by: Dennis Gilmore --- ...Support-release-set-to-None-globally.patch | 61 ------------------- pungi.spec | 26 ++++++-- sources | 2 +- 3 files changed, 23 insertions(+), 66 deletions(-) delete mode 100644 0001-live-media-Support-release-set-to-None-globally.patch diff --git a/0001-live-media-Support-release-set-to-None-globally.patch b/0001-live-media-Support-release-set-to-None-globally.patch deleted file mode 100644 index a7902b9e..00000000 --- a/0001-live-media-Support-release-set-to-None-globally.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4dd1cca9449f612c35891c58f9293491135074ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= -Date: Wed, 9 Mar 2016 13:08:22 +0100 -Subject: [PATCH 1/2] [live-media] Support release set to None globally -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Lubomír Sedlář ---- - pungi/phases/livemedia_phase.py | 2 +- - tests/test_livemediaphase.py | 20 ++++++++++++++++++++ - 2 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/pungi/phases/livemedia_phase.py b/pungi/phases/livemedia_phase.py -index 1060317..c5f3ec2 100644 ---- a/pungi/phases/livemedia_phase.py -+++ b/pungi/phases/livemedia_phase.py -@@ -35,7 +35,7 @@ class LiveMediaPhase(PhaseBase): - }, - { - "name": "live_media_release", -- "expected_types": [str], -+ "expected_types": [str, type(None)], - "optional": True, - } - ) -diff --git a/tests/test_livemediaphase.py b/tests/test_livemediaphase.py -index 20ccdfc..493ffe2 100755 ---- a/tests/test_livemediaphase.py -+++ b/tests/test_livemediaphase.py -@@ -14,6 +14,26 @@ from tests.helpers import DummyCompose, PungiTestCase - - - class TestLiveMediaPhase(PungiTestCase): -+ -+ def test_global_config_validation(self): -+ compose = DummyCompose(self.topdir, { -+ 'live_media_ksurl': 'git://example.com/repo.git#HEAD', -+ 'live_media_target': 'f24', -+ 'live_media_release': 'RRR', -+ 'live_media_version': 'Rawhide', -+ }) -+ -+ phase = LiveMediaPhase(compose) -+ phase.validate() -+ -+ def test_global_config_null_release(self): -+ compose = DummyCompose(self.topdir, { -+ 'live_media_release': None, -+ }) -+ -+ phase = LiveMediaPhase(compose) -+ phase.validate() -+ - @mock.patch('pungi.phases.livemedia_phase.ThreadPool') - def test_live_media_minimal(self, ThreadPool): - compose = DummyCompose(self.topdir, { --- -2.5.0 - diff --git a/pungi.spec b/pungi.spec index 3dd0fb93..15eb9769 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,13 +1,12 @@ Name: pungi -Version: 4.0.8 -Release: 2%{?dist} +Version: 4.0.9 +Release: 1%{?dist} Summary: Distribution compose tool Group: Development/Tools License: GPLv2 URL: https://pagure.io/pungi Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2 -Patch0: 0001-live-media-Support-release-set-to-None-globally.patch BuildRequires: python-nose, python-nose-cov, python-mock BuildRequires: python-devel, python-setuptools, python2-productmd @@ -42,7 +41,6 @@ A tool to create anaconda based installation trees/isos of a set of rpms. %prep %setup -q -%patch0 -p1 %build %{__python} setup.py build @@ -68,6 +66,26 @@ nosetests --exe --with-cov --cov-report html --cov-config tox.ini /var/cache/pungi %changelog +* Thu Mar 10 2016 Dennis Gilmore - 4.0.9-1 +- [init] Update documentation (lsedlar) +- [init] Iterate over arches just once (lsedlar) +- [init] Remove duplicated checks for comps (lsedlar) +- [init] Break long lines (lsedlar) +- [init] Don't overwrite the same log file (lsedlar) +- [init] Add config option for keeping original comps (lsedlar) +- Add tests for the init phase (lsedlar) +- [checks] Test printing in all cases (lsedlar) +- [checks] Reduce code duplication (lsedlar) +- [checks] Relax check for genisoimage (lsedlar) +- [checks] Remove duplicate msgfmt line (lsedlar) +- [checks] Relax check for isohybrid command (lsedlar) +- [checks] Add tests for dependency checking (lsedlar) +- [checks] Don't always require jigdo (lsedlar) +- [pkgset] Respect inherit setting (lsedlar) +- specify that the 4.0 docs are for 4.0.8 (dennis) +- [live-media] Support release set to None globally (lsedlar) +- include tests/fixtures/* in the tarball (dennis) + * Wed Mar 09 2016 Dennis Gilmore - 4.0.8-2 - add patch to allow livemedia_release to be None globally diff --git a/sources b/sources index ac4edc8d..c55a611b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c505e67fb747439383e65b413d313ed6 pungi-4.0.8.tar.bz2 +458d19d3d5c5c4ef1501749088e10b24 pungi-4.0.9.tar.bz2