From f730f5b1e8dad109c90c92f4184efc2e2d7f3ce2 Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: Oct 15 2018 07:31:24 +0000 Subject: New upstream release --- diff --git a/.gitignore b/.gitignore index 0886580..edffd54 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /compose-utils-0.1.23.tar.bz2 /compose-utils-0.1.24.tar.bz2 /compose-utils-0.1.25.tar.bz2 +/compose-utils-0.1.26.tar.bz2 diff --git a/0001-Fix-tests-on-Python-3.7.patch b/0001-Fix-tests-on-Python-3.7.patch new file mode 100644 index 0000000..7a97ecb --- /dev/null +++ b/0001-Fix-tests-on-Python-3.7.patch @@ -0,0 +1,50 @@ +From c222c772c5e23de9fdf658e1c5864712c9cfdd78 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= +Date: Mon, 15 Oct 2018 09:28:44 +0200 +Subject: [PATCH] Fix tests on Python 3.7 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Filter returns an iterator object that does not have __len__. Better +convert it to a list. + +Signed-off-by: Lubomír Sedlář +--- + compose_utils/essentials.py | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/compose_utils/essentials.py b/compose_utils/essentials.py +index 02f49da..d79e20d 100644 +--- a/compose_utils/essentials.py ++++ b/compose_utils/essentials.py +@@ -69,15 +69,17 @@ def get_images(compose, types=["qcow2"]): + + def get_essentials(compose_path): + compose = productmd.compose.Compose(compose_path) +- return filter( +- None, +- [ +- get_package_version(compose, "kernel"), +- get_package_version(compose, "lorax"), +- get_package_version(compose, "anaconda"), +- get_containers(compose), +- get_images(compose) +- ], ++ return list( ++ filter( ++ None, ++ [ ++ get_package_version(compose, "kernel"), ++ get_package_version(compose, "lorax"), ++ get_package_version(compose, "anaconda"), ++ get_containers(compose), ++ get_images(compose), ++ ], ++ ) + ) + + +-- +2.17.2 + diff --git a/compose-utils.spec b/compose-utils.spec index 550c55a..de048d7 100644 --- a/compose-utils.spec +++ b/compose-utils.spec @@ -1,11 +1,12 @@ Name: compose-utils -Version: 0.1.25 +Version: 0.1.26 Release: 1%{?dist} Summary: Utilities for working with composes License: GPLv2 URL: https://pagure.io/compose-utils Source0: https://pagure.io/releases/compose-utils/%{name}-%{version}.tar.bz2 +Patch0: 0001-Fix-tests-on-Python-3.7.patch BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-productmd >= 1.1 @@ -36,7 +37,7 @@ Python 3 libraries supporting tools for working with composes %prep -%setup -q +%autosetup -p1 %build @@ -64,6 +65,9 @@ Python 3 libraries supporting tools for working with composes %changelog +* Mon Oct 15 2018 Lubomír Sedlář - 0.1.26-1 +- New upstream release + * Tue Aug 28 2018 Lubomír Sedlář - 0.1.25-1 - New upstream release diff --git a/sources b/sources index 38db331..fdd7c46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (compose-utils-0.1.25.tar.bz2) = 620555008ad5765eafd0f9cab30424c5331d67c492ecb8d2560d7605e00220011b4ce61058c0985fa5e2f194b621477568a4deb95f6da0623e4ea6669b70ceff +SHA512 (compose-utils-0.1.26.tar.bz2) = 86f1f30f2895a8675b962daf0c31b0abf787dcc3369afabfc9c53f6028202d432fea3fff3a2cbf325a4f5a4e9d0259ecb19efc182ad7ce0e5e7b41f1e05f54ac