From 0b2167ec1c39fe7776313179bfd0a1db43f86c2b Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 18 Jun 2019 13:15:14 -0500 Subject: [PATCH 1/4] Sync with upstream release 69.1 (LTS series). Signed-off-by: Merlin Mathesius --- .gitignore | 1 + python-avocado.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 17079e4..94ccf36 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /avocado-67.0.tar.gz /avocado-68.0.tar.gz /avocado-69.0.tar.gz +/avocado-69.1.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 9dd4415..3243805 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 406f29bbdf46f2320936da0028ae5df53559915c + %global commit 5ed5ac2fc05c65f06a199d41d27f632c68ffe9cd %endif %if ! 0%{?commit_date:1} - %global commit_date 20190226 + %global commit_date 20190612 %endif %global shortcommit %(c=%{commit};echo ${c:0:8}) %global gitrel .%{commit_date}git%{shortcommit} @@ -70,8 +70,8 @@ %endif Name: python-%{pkgname} -Version: 69.0 -Release: 4%{?gitrel}%{?dist} +Version: 69.1 +Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -1170,6 +1170,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Tue Jun 18 2019 Merlin Mathesius - 69.1-1 +- Sync with upstream release 69.1 (LTS series). + * Wed May 22 2019 Merlin Mathesius - 69.0-4 - pyliblzma is Python 2-only and no longer available as of F31. - Unversioned executables should now be Python 3. diff --git a/sources b/sources index 5a59e5d..09c3124 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-69.0.tar.gz) = 5353c85d94a9754a6e23eb2b4e1a09dc4f87e3590ff1073383b2b8ac5e2eeb7cddadf5773c762f1dbd8b7a04ed6314f68cf7014acc4e709683f0251518c30b10 +SHA512 (avocado-69.1.tar.gz) = 9a41127e17ae3f328287e9450389872e4ffcb7867c56bf95d0f039067530f8e9bf780362a9a26a6ecbc8304225543f367fba7969cbd4aa9a644d54046bfb6b43 From c64e62364a291238699c5b926ea2e82b3cf602c3 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 9 Sep 2019 16:36:17 -0500 Subject: [PATCH 2/4] Patch to skip selftest currently incompatible with Python 3.8. Signed-off-by: Merlin Mathesius --- avocado-69.1-selftest-py3.8.patch | 20 ++++++++++++++++++++ python-avocado.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 avocado-69.1-selftest-py3.8.patch diff --git a/avocado-69.1-selftest-py3.8.patch b/avocado-69.1-selftest-py3.8.patch new file mode 100644 index 0000000..6020d5d --- /dev/null +++ b/avocado-69.1-selftest-py3.8.patch @@ -0,0 +1,20 @@ +diff -ru ../avocado-69.1.ORIG/selftests/unit/test_loader.py ./selftests/unit/test_loader.py +--- ../avocado-69.1.ORIG/selftests/unit/test_loader.py 2019-06-12 13:39:15.000000000 -0500 ++++ ./selftests/unit/test_loader.py 2019-09-09 16:23:21.637693415 -0500 +@@ -1,6 +1,7 @@ + import os + import shutil + import stat ++import sys + import tempfile + import unittest + +@@ -449,6 +450,8 @@ + ('Test10', 'selftests/.data/loader_instrumented/imports.py:Test10.test')] + self._check_discovery(exps, tests) + ++ @unittest.skipIf(sys.version_info[0:2] == (3, 8), ++ "Test currently broken on Python 3.8") + def test_dont_detect_non_avocado(self): + path = os.path.join(os.path.dirname(os.path.dirname(__file__)), + '.data', 'loader_instrumented', 'dont_detect_non_avocado.py') diff --git a/python-avocado.spec b/python-avocado.spec index 3243805..56ea5ad 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -71,7 +71,7 @@ Name: python-%{pkgname} Version: 69.1 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -81,6 +81,7 @@ Group: Development/Tools License: GPLv2 and MIT URL: http://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{gitref}.tar.gz#/%{gittar} +Patch0: avocado-69.1-selftest-py3.8.patch BuildArch: noarch BuildRequires: procps-ng @@ -189,6 +190,7 @@ these days a framework) to perform automated testing. %prep %setup -q -n %{srcname}-%{gitref} +%patch0 -p1 # package plugins-runner-vm requires libvirt-python, but the RPM # version of libvirt-python does not publish the egg info and this # causes that dep to be attempted to be installed by pip @@ -1170,6 +1172,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Mon Sep 09 2019 Merlin Mathesius - 69.1-2 +- Patch to skip selftest currently incompatible with Python 3.8. + * Tue Jun 18 2019 Merlin Mathesius - 69.1-1 - Sync with upstream release 69.1 (LTS series). From c781f06f55af7ccd26cfd82eeb2211450d70623f Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Wed, 11 Sep 2019 16:02:59 -0500 Subject: [PATCH 3/4] Update patch to always skip unreliable selftest. Signed-off-by: Merlin Mathesius --- ...est-py3.8.patch => avocado-69.1-selftest.patch | 15 +++------------ python-avocado.spec | 7 +++++-- 2 files changed, 8 insertions(+), 14 deletions(-) rename avocado-69.1-selftest-py3.8.patch => avocado-69.1-selftest.patch (62%) diff --git a/avocado-69.1-selftest-py3.8.patch b/avocado-69.1-selftest.patch similarity index 62% rename from avocado-69.1-selftest-py3.8.patch rename to avocado-69.1-selftest.patch index 6020d5d..27992ae 100644 --- a/avocado-69.1-selftest-py3.8.patch +++ b/avocado-69.1-selftest.patch @@ -1,20 +1,11 @@ diff -ru ../avocado-69.1.ORIG/selftests/unit/test_loader.py ./selftests/unit/test_loader.py --- ../avocado-69.1.ORIG/selftests/unit/test_loader.py 2019-06-12 13:39:15.000000000 -0500 -+++ ./selftests/unit/test_loader.py 2019-09-09 16:23:21.637693415 -0500 -@@ -1,6 +1,7 @@ - import os - import shutil - import stat -+import sys - import tempfile - import unittest - -@@ -449,6 +450,8 @@ ++++ ./selftests/unit/test_loader.py 2019-09-11 15:56:24.289042537 -0500 +@@ -449,6 +449,7 @@ ('Test10', 'selftests/.data/loader_instrumented/imports.py:Test10.test')] self._check_discovery(exps, tests) -+ @unittest.skipIf(sys.version_info[0:2] == (3, 8), -+ "Test currently broken on Python 3.8") ++ @unittest.skip("Disabling unreliable test") def test_dont_detect_non_avocado(self): path = os.path.join(os.path.dirname(os.path.dirname(__file__)), '.data', 'loader_instrumented', 'dont_detect_non_avocado.py') diff --git a/python-avocado.spec b/python-avocado.spec index 56ea5ad..19e7cc8 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -71,7 +71,7 @@ Name: python-%{pkgname} Version: 69.1 -Release: 2%{?gitrel}%{?dist} +Release: 3%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -81,7 +81,7 @@ Group: Development/Tools License: GPLv2 and MIT URL: http://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{gitref}.tar.gz#/%{gittar} -Patch0: avocado-69.1-selftest-py3.8.patch +Patch0: avocado-69.1-selftest.patch BuildArch: noarch BuildRequires: procps-ng @@ -1172,6 +1172,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Wed Sep 11 2019 Merlin Mathesius - 69.1-3 +- Update patch to always skip unreliable selftest. + * Mon Sep 09 2019 Merlin Mathesius - 69.1-2 - Patch to skip selftest currently incompatible with Python 3.8. From 079897c6bdc1a8fedce81cc9e7eef1203354b940 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Fri, 4 Oct 2019 15:27:29 -0500 Subject: [PATCH 4/4] Sync with upstream release 69.2 (LTS series). Signed-off-by: Merlin Mathesius --- .gitignore | 1 + python-avocado.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 94ccf36..5c17832 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /avocado-68.0.tar.gz /avocado-69.0.tar.gz /avocado-69.1.tar.gz +/avocado-69.2.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 19e7cc8..add3cee 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -12,10 +12,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit 5ed5ac2fc05c65f06a199d41d27f632c68ffe9cd + %global commit 489fee786c7b69cf0fa12f75be0595cb8bae5887 %endif %if ! 0%{?commit_date:1} - %global commit_date 20190612 + %global commit_date 20190917 %endif %global shortcommit %(c=%{commit};echo ${c:0:8}) %global gitrel .%{commit_date}git%{shortcommit} @@ -70,8 +70,8 @@ %endif Name: python-%{pkgname} -Version: 69.1 -Release: 3%{?gitrel}%{?dist} +Version: 69.2 +Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -1172,6 +1172,9 @@ Again Shell code (and possibly other similar shells). %changelog +* Fri Oct 04 2019 Merlin Mathesius - 69.2-1 +- Sync with upstream release 69.2 (LTS series). + * Wed Sep 11 2019 Merlin Mathesius - 69.1-3 - Update patch to always skip unreliable selftest. diff --git a/sources b/sources index 09c3124..9a6f026 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-69.1.tar.gz) = 9a41127e17ae3f328287e9450389872e4ffcb7867c56bf95d0f039067530f8e9bf780362a9a26a6ecbc8304225543f367fba7969cbd4aa9a644d54046bfb6b43 +SHA512 (avocado-69.2.tar.gz) = edf348ed083c72de511190e0c615861cd413a54c30082f1a345d689ce7990bd0ceebfc81893087e3bc015716c6ae7ef104a71658f4b2b7cc75ec657ebe4eff61