From 2e39fac89a4f342ad685e7cf86c658cb27f74ef8 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 3 Apr 2018 15:26:58 -0500 Subject: [PATCH 1/9] Sync with upstream release 52.1 (LTS series). Correct deprecated use of unversioned python. Remove obsolete CI test directory. --- .gitignore | 1 + avocado-selftest-fix-cmdline-check.patch | 15 +++++++++ python-avocado.spec | 43 ++++++++++++++++-------- sources | 2 +- test/help-usage-1/Makefile | 14 -------- test/help-usage-1/README.rst | 13 ------- test/help-usage-1/runtask.yml | 29 ---------------- test/help-usage-1/runtest.sh | 13 ------- 8 files changed, 46 insertions(+), 84 deletions(-) create mode 100644 avocado-selftest-fix-cmdline-check.patch delete mode 100644 test/help-usage-1/Makefile delete mode 100644 test/help-usage-1/README.rst delete mode 100644 test/help-usage-1/runtask.yml delete mode 100755 test/help-usage-1/runtest.sh diff --git a/.gitignore b/.gitignore index 5684048..c102fa6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /avocado-50.0.tar.gz /avocado-51.0.tar.gz /avocado-52.0.tar.gz +/avocado-52.1.tar.gz diff --git a/avocado-selftest-fix-cmdline-check.patch b/avocado-selftest-fix-cmdline-check.patch new file mode 100644 index 0000000..525a869 --- /dev/null +++ b/avocado-selftest-fix-cmdline-check.patch @@ -0,0 +1,15 @@ +diff -ru ../avocado-52.1.orig/selftests/functional/test_plugin_diff.py ./selftests/functional/test_plugin_diff.py +--- ../avocado-52.1.orig/selftests/functional/test_plugin_diff.py 2018-03-01 12:05:02.000000000 -0600 ++++ ./selftests/functional/test_plugin_diff.py 2018-03-13 16:50:33.662490323 -0500 +@@ -52,9 +52,9 @@ + result = self.run_and_check(cmd_line, expected_rc) + msg = "# COMMAND LINE" + self.assertIn(msg, result.stdout) +- msg = "-./scripts/avocado run" ++ msg = "-%s run" % AVOCADO + self.assertIn(msg, result.stdout) +- msg = "+./scripts/avocado run" ++ msg = "+%s run" % AVOCADO + self.assertIn(msg, result.stdout) + + def test_diff_nocmdline(self): diff --git a/python-avocado.spec b/python-avocado.spec index fc9c075..036169a 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -11,10 +11,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} - %global commit bb62fe5a1fa93ea6573da46556928af5041c1b7d + %global commit 0ddd3c7b92f18c85157766e9e0ec810e6b3dd37e %endif %if ! 0%{?commit_date:1} - %global commit_date 20170626 + %global commit_date 20180301 %endif %global shortcommit %(c=%{commit};echo ${c:0:7}) %global gitrel .%{commit_date}git%{shortcommit} @@ -27,14 +27,14 @@ # enabled by default. # However, selftests need to be disabled when libvirt is not available. %global with_tests 1 -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 # libvirt is not available for all RHEL builder architectures %global with_tests 0 %endif Name: python-%{pkgname} -Version: 52.0 -Release: 3%{?gitrel}%{?dist} +Version: 52.1 +Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -51,6 +51,7 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{version}.tar. Source0: https://github.com/avocado-framework/%{srcname}/archive/%{commit}.tar.gz#/%{gittar} %endif Patch0: avocado-selftest-doublefree-disable.patch +Patch1: avocado-selftest-fix-cmdline-check.patch BuildArch: noarch BuildRequires: fabric BuildRequires: pystache @@ -65,14 +66,14 @@ BuildRequires: python-resultsdb_api %if 0%{?with_tests} BuildRequires: libvirt-python BuildRequires: perl(TAP::Parser) -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-yaml %else BuildRequires: python2-yaml %endif %endif -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-psutil BuildRequires: python-requests BuildRequires: python-setuptools @@ -105,10 +106,7 @@ BuildRequires: procps-ng BuildRequires: python-crypto %endif -%if 0%{?fedora} >= 25 -BuildRequires: kmod -%endif -%if 0%{?rhel} >= 7 +%if 0%{?fedora} >= 25 || 0%{?rhel} >= 7 BuildRequires: kmod %endif @@ -128,7 +126,7 @@ Requires: pyliblzma Requires: pystache Requires: python2 -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-requests Requires: python-stevedore %else @@ -219,7 +217,7 @@ server. Summary: Avocado plugin to generate variants out of yaml files %{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb} Requires: python2-%{pkgname} == %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-yaml %else Requires: python2-yaml @@ -249,6 +247,7 @@ examples of how to write tests on your own. %setup -q -n %{srcname}-%{commit} %endif %patch0 -p1 +%patch1 -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 @@ -296,6 +295,12 @@ popd pushd optional_plugins/varianter_yaml_to_mux %{__python2} setup.py install --root %{buildroot} --skip-build popd +%{__mv} %{buildroot}%{_bindir}/avocado %{buildroot}%{_bindir}/avocado-%{python2_version} +%{__ln_s} avocado-%{python2_version} %{buildroot}%{_bindir}/avocado-2 +%{__ln_s} avocado-%{python2_version} %{buildroot}%{_bindir}/avocado +%{__mv} %{buildroot}%{_bindir}/avocado-rest-client %{buildroot}%{_bindir}/avocado-rest-client-%{python2_version} +%{__ln_s} avocado-rest-client-%{python2_version} %{buildroot}%{_bindir}/avocado-rest-client-2 +%{__ln_s} avocado-rest-client-%{python2_version} %{buildroot}%{_bindir}/avocado-rest-client %{__mkdir_p} %{buildroot}%{_mandir}/man1 %{__install} -m 0644 man/avocado.1 %{buildroot}%{_mandir}/man1/avocado.1 %{__install} -m 0644 man/avocado-rest-client.1 %{buildroot}%{_mandir}/man1/avocado-rest-client.1 @@ -331,7 +336,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x # Package build environments have the least amount of resources # we have observed so far. Let's avoid tests that require too # much resources or are time sensitive. - AVOCADO_CHECK_LEVEL=0 selftests/run + # Also, use of unversioned python is deprecated, so force use of python2 as per + # https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build + AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD="$HOME/.local/bin/avocado" %{__python2} selftests/run %endif @@ -355,7 +362,11 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %{_sysconfdir}/avocado/scripts/job/post.d/README %{python2_sitelib}/avocado/ %{python2_sitelib}/avocado_framework-%{version}-py%{python2_version}.egg-info +%{_bindir}/avocado-%{python2_version} +%{_bindir}/avocado-2 %{_bindir}/avocado +%{_bindir}/avocado-rest-client-%{python2_version} +%{_bindir}/avocado-rest-client-2 %{_bindir}/avocado-rest-client %{_mandir}/man1/avocado.1.gz %{_mandir}/man1/avocado-rest-client.1.gz @@ -408,6 +419,10 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Tue Apr 03 2018 Merlin Mathesius - 52.1-1 +- Sync with upstream release 52.1 (LTS series). +- Correct deprecated use of unversioned python. + * Wed Aug 09 2017 Merlin Mathesius - 52.0-3 - Fix FTBFS error by disabling selfcheck producing false failures - Update SPEC to use pkgname instead of srcname macro where appropriate diff --git a/sources b/sources index 13be916..54aeac2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-52.0.tar.gz) = 291587c90b2774e3030595cb9ae3781e1bd151c9a3d21e899a64ba1da766387b40979700f4c6b1c373156f2eda4be1857c98b08cc32c5a712c8bd4f168da04cc +SHA512 (avocado-52.1.tar.gz) = fb97ea6056700f57f34e8e4ce0c27774c386d646aaffc7da2abb8d0a797cff4448934789ffaf81da1592fceae1bb464da2b5dde000730c4f417b03552a432c6c diff --git a/test/help-usage-1/Makefile b/test/help-usage-1/Makefile deleted file mode 100644 index d71e61f..0000000 --- a/test/help-usage-1/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -.PHONY: all install download clean - -BUILT_FILES= - -FILES=runtest.sh Makefile - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x ./runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) diff --git a/test/help-usage-1/README.rst b/test/help-usage-1/README.rst deleted file mode 100644 index 1d25e34..0000000 --- a/test/help-usage-1/README.rst +++ /dev/null @@ -1,13 +0,0 @@ -help-usage-1 -============ - -This is an example task for `Taskotron `_ -that tests the basic functionality of 'avocado --help' to confirm it generates a usage message. - -Standalone you can run it like this:: - - $ make run - -Through taskotron runner you can run it like this:: - - $ runtask -i python-avocado-46.0-2.fc25 -t koji_build -a noarch runtask.yml diff --git a/test/help-usage-1/runtask.yml b/test/help-usage-1/runtask.yml deleted file mode 100644 index 1ff3857..0000000 --- a/test/help-usage-1/runtask.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -name: help-usage-1 -desc: "Tests the basic functionality of 'avocado --help' to confirm it generates a usage message." -maintainer: merlinm - -input: - args: - - koji_build - - arch - -environment: - rpm: - - make - -actions: - - name: download the build - koji: - action: download - koji_build: ${koji_build} - arch: $arch - target_dir: ${workdir}/rpms - - - name: install the build - shell: - - dnf install -y ${workdir}/rpms/*.rpm - - - name: run test - shell: - - make run diff --git a/test/help-usage-1/runtest.sh b/test/help-usage-1/runtest.sh deleted file mode 100755 index b2cb24b..0000000 --- a/test/help-usage-1/runtest.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -PACKAGE=python-avocado - -# Assume the test will pass. -result=PASS - -avocado --help | grep -q -i '^usage:' -if [ $? -ne 0 ]; then - result=FAIL -fi - -echo $result From 56cf4c46827524941171ef24554964d5998057bf Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 14 May 2018 14:10:36 -0500 Subject: [PATCH 2/9] correct python_provide argument typo for varianter-yaml-to-mux plugin --- python-avocado.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-avocado.spec b/python-avocado.spec index d80d9dd..5f4e594 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -34,7 +34,7 @@ Name: python-%{pkgname} Version: 52.1 -Release: 2%{?gitrel}%{?dist} +Release: 3%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -215,7 +215,7 @@ server. %package -n python2-%{pkgname}-plugins-varianter-yaml-to-mux Summary: Avocado plugin to generate variants out of yaml files -%{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb} +%{?python_provide:%python_provide python2-%{pkgname}-plugins-varianter-yaml-to-mux} Requires: python2-%{pkgname} == %{version}-%{release} %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-yaml @@ -419,6 +419,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Mon May 14 2018 Merlin Mathesius - 52.1-3 +- correct python_provide argument typo for varianter-yaml-to-mux plugin + * Mon Apr 9 2018 Cleber Rosa - 52.1-2 - Added Fedora CI tests From 384b8eaf64dc83b42134e39f6bfb2d22e409aad2 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 14 May 2018 17:09:04 -0500 Subject: [PATCH 3/9] Dependency fabric has been renamed to python2-fabric3 --- python-avocado.spec | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/python-avocado.spec b/python-avocado.spec index 5f4e594..6a185f0 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -34,7 +34,7 @@ Name: python-%{pkgname} Version: 52.1 -Release: 3%{?gitrel}%{?dist} +Release: 4%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -53,7 +53,6 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{commit}.tar.g Patch0: avocado-selftest-doublefree-disable.patch Patch1: avocado-selftest-fix-cmdline-check.patch BuildArch: noarch -BuildRequires: fabric BuildRequires: python2-pystache BuildRequires: python2-aexpect BuildRequires: python2-devel @@ -63,6 +62,12 @@ BuildRequires: python2-lxml BuildRequires: python2-mock BuildRequires: python2-resultsdb_api +%if 0%{?fedora} >= 29 +BuildRequires: python2-fabric3 +%else +BuildRequires: fabric +%endif + %if 0%{?with_tests} BuildRequires: python2-libvirt BuildRequires: perl(TAP::Parser) @@ -119,13 +124,18 @@ these days a framework) to perform automated testing. Summary: %{summary} License: GPLv2 and MIT %{?python_provide:%python_provide python2-%{pkgname}} -Requires: fabric Requires: gdb Requires: gdb-gdbserver Requires: pyliblzma Requires: python2-pystache Requires: python2 +%if 0%{?fedora} >= 29 +Requires: python2-fabric3 +%else +Requires: fabric +%endif + %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-requests Requires: python-stevedore @@ -166,10 +176,14 @@ arbitrary filesystem location. Summary: Avocado Runner for Remote Execution %{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-remote} Requires: python2-%{pkgname} == %{version}-%{release} -Requires: fabric %if 0%{?fedora} == 24 Requires: python-crypto %endif +%if 0%{?fedora} >= 29 +Requires: python2-fabric3 +%else +Requires: fabric +%endif %description -n python2-%{pkgname}-plugins-runner-remote Allows Avocado to run jobs on a remote machine, by means of an SSH @@ -252,6 +266,9 @@ examples of how to write tests on your own. # version of libvirt-python does not publish the egg info and this # causes that dep to be attempted to be installed by pip sed -e "s/'libvirt-python'//" -i optional_plugins/runner_vm/setup.py +%if 0%{?fedora} >= 29 +sed -e "s/'fabric'/'fabric3'/" -i optional_plugins/runner_remote/setup.py +%endif %build %{__python2} setup.py build @@ -419,6 +436,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Mon May 14 2018 Merlin Mathesius - 52.1-4 +- Dependency fabric has been renamed to python2-fabric3 + * Mon May 14 2018 Merlin Mathesius - 52.1-3 - correct python_provide argument typo for varianter-yaml-to-mux plugin From 1087f35c47f4c5fcc7e4591d55000eee6d43a99c Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 5 Jun 2018 08:26:58 -0500 Subject: [PATCH 4/9] Conditionalize python2 dependencies for cross-release compatibility of SPEC --- python-avocado.spec | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/python-avocado.spec b/python-avocado.spec index 6a185f0..ac80f02 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -34,7 +34,7 @@ Name: python-%{pkgname} Version: 52.1 -Release: 4%{?gitrel}%{?dist} +Release: 5%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -53,15 +53,21 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{commit}.tar.g Patch0: avocado-selftest-doublefree-disable.patch Patch1: avocado-selftest-fix-cmdline-check.patch BuildArch: noarch -BuildRequires: python2-pystache BuildRequires: python2-aexpect BuildRequires: python2-devel BuildRequires: python2-docutils -BuildRequires: python2-flexmock -BuildRequires: python2-lxml BuildRequires: python2-mock BuildRequires: python2-resultsdb_api +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +BuildRequires: python2-flexmock +BuildRequires: python2-lxml +BuildRequires: python2-pystache +%else +BuildRequires: python-flexmock +BuildRequires: python-lxml +BuildRequires: pystache +%endif %if 0%{?fedora} >= 29 BuildRequires: python2-fabric3 %else @@ -69,8 +75,12 @@ BuildRequires: fabric %endif %if 0%{?with_tests} -BuildRequires: python2-libvirt BuildRequires: perl(TAP::Parser) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 7 +BuildRequires: python2-libvirt +%else +BuildRequires: libvirt-python +%endif %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-yaml %else @@ -127,9 +137,13 @@ License: GPLv2 and MIT Requires: gdb Requires: gdb-gdbserver Requires: pyliblzma -Requires: python2-pystache Requires: python2 +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +Requires: python2-pystache +%else +Requires: pystache +%endif %if 0%{?fedora} >= 29 Requires: python2-fabric3 %else @@ -164,7 +178,12 @@ these days a framework) to perform automated testing. Summary: Avocado HTML report plugin %{?python_provide:%python_provide python2-%{pkgname}-plugins-output-html} Requires: python2-%{pkgname} == %{version}-%{release} + +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 Requires: python2-pystache +%else +Requires: pystache +%endif %description -n python2-%{pkgname}-plugins-output-html Adds to avocado the ability to generate an HTML report at every job results @@ -195,7 +214,11 @@ Summary: Avocado Runner for libvirt VM Execution %{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-vm} Requires: python2-%{pkgname} == %{version}-%{release} Requires: python2-%{pkgname}-plugins-runner-remote == %{version}-%{release} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 7 Requires: python2-libvirt +%else +Requires: libvirt-python +%endif %description -n python2-%{pkgname}-plugins-runner-vm Allows Avocado to run jobs on a libvirt based VM, by means of @@ -436,6 +459,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Mon Jun 04 2018 Merlin Mathesius - 52.1-5 +- Conditionalize python2 dependencies for cross-release compatibility of SPEC + * Mon May 14 2018 Merlin Mathesius - 52.1-4 - Dependency fabric has been renamed to python2-fabric3 From ed6d05362ffc99755fc47535a0cf528cb83ace5a Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Fri, 8 Jun 2018 09:32:13 -0500 Subject: [PATCH 5/9] Correct libvirt dependency for EPEL7/RHEL7 --- python-avocado.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-avocado.spec b/python-avocado.spec index ac80f02..142eca5 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -34,7 +34,7 @@ Name: python-%{pkgname} Version: 52.1 -Release: 5%{?gitrel}%{?dist} +Release: 6%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -76,7 +76,7 @@ BuildRequires: fabric %if 0%{?with_tests} BuildRequires: perl(TAP::Parser) -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 BuildRequires: python2-libvirt %else BuildRequires: libvirt-python @@ -214,7 +214,7 @@ Summary: Avocado Runner for libvirt VM Execution %{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-vm} Requires: python2-%{pkgname} == %{version}-%{release} Requires: python2-%{pkgname}-plugins-runner-remote == %{version}-%{release} -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 Requires: python2-libvirt %else Requires: libvirt-python @@ -459,6 +459,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Fri Jun 08 2018 Merlin Mathesius - 52.1-6 +- Correct libvirt dependency for EPEL7/RHEL7 + * Mon Jun 04 2018 Merlin Mathesius - 52.1-5 - Conditionalize python2 dependencies for cross-release compatibility of SPEC From 0b2167ec1c39fe7776313179bfd0a1db43f86c2b Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 18 Jun 2019 13:15:14 -0500 Subject: [PATCH 6/9] 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 7/9] 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 8/9] 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 9/9] 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