diff --git a/.gitignore b/.gitignore index 17079e4..f435916 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-70.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 9dd4415..d2842ae 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 cc0a3f66a1ae11bbc165fd787a04926cdab88f80 %endif %if ! 0%{?commit_date:1} - %global commit_date 20190226 + %global commit_date 20190625 %endif %global shortcommit %(c=%{commit};echo ${c:0:8}) %global gitrel .%{commit_date}git%{shortcommit} @@ -34,17 +34,6 @@ %global with_tests 0 %endif -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 - %bcond_with python2 -%else - %bcond_without python2 -%endif -%if 0%{?fedora} || 0%{?rhel} > 7 - %bcond_without python3 -%else - %bcond_with python3 -%endif - # Avocado is currently incompatible with the Fabric API in Fedora 31 and later # https://github.com/avocado-framework/avocado/issues/3125 %if 0%{?fedora} >= 31 @@ -54,24 +43,15 @@ %endif # Python 3 version of Fabric package is new starting with Fedora 29 -%if %{with python3} && 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 %global with_python3_fabric 1 %else %global with_python3_fabric 0 %endif -# Python2 binary packages are being removed -# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal -# python2-resultsdb_api package has been removed in F30 -%if %{with python2} && ( (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) ) -%global with_python2_resultsdb 1 -%else -%global with_python2_resultsdb 0 -%endif - Name: python-%{pkgname} -Version: 69.0 -Release: 4%{?gitrel}%{?dist} +Version: 70.0 +Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -83,54 +63,8 @@ URL: http://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{gitref}.tar.gz#/%{gittar} BuildArch: noarch -BuildRequires: procps-ng BuildRequires: kmod - -%if %{with python2} -BuildRequires: python2-aexpect -BuildRequires: python2-devel -BuildRequires: python2-docutils -BuildRequires: python2-mock -BuildRequires: python2-psutil -BuildRequires: python2-requests -BuildRequires: python2-setuptools -BuildRequires: python2-six -%if 0%{?fedora} && 0%{?fedora} <= 30 -# python2-sphinx is no longer available or needed as of F31 -BuildRequires: python2-sphinx -%endif -%if 0%{?fedora} > 27 || 0%{?rhel} > 7 -BuildRequires: python2-jinja2 -%else -BuildRequires: python-jinja2 -%endif -%if %{with_fabric} -%if 0%{?fedora} >= 29 -BuildRequires: python2-fabric3 -%else -BuildRequires: fabric -%endif -%endif # with_fabric -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python2-enum34 -BuildRequires: python2-lxml -BuildRequires: python2-stevedore -%else -BuildRequires: python-enum34 -BuildRequires: python-lxml -BuildRequires: python-stevedore -%endif -%if 0%{?fedora} && 0%{?fedora} <= 29 -# Python2 binary packages are being removed -# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal -BuildRequires: python2-pycdlib -%endif -%if %{with_python2_resultsdb} -BuildRequires: python2-resultsdb_api -%endif -%endif - -%if %{with python3} +BuildRequires: procps-ng BuildRequires: python3-aexpect BuildRequires: python3-devel BuildRequires: python3-docutils @@ -139,7 +73,6 @@ BuildRequires: python3-lxml BuildRequires: python3-mock BuildRequires: python3-psutil BuildRequires: python3-pycdlib -BuildRequires: python3-requests BuildRequires: python3-resultsdb_api BuildRequires: python3-setuptools BuildRequires: python3-six @@ -150,7 +83,6 @@ BuildRequires: python3-stevedore BuildRequires: python3-fabric3 %endif %endif # with_fabric -%endif %if 0%{?with_tests} BuildRequires: genisoimage @@ -160,18 +92,6 @@ BuildRequires: psmisc %if 0%{?fedora} >= 30 || 0%{?rhel} > 7 BuildRequires: glibc-all-langpacks %endif -%if %{with python2} -%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 -BuildRequires: python2-libvirt -BuildRequires: python2-netifaces -BuildRequires: python2-yaml -%else -BuildRequires: libvirt-python -BuildRequires: python-netifaces -BuildRequires: python-yaml -%endif -%endif -%if %{with python3} BuildRequires: python3-netifaces BuildRequires: python3-yaml %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 @@ -179,8 +99,7 @@ BuildRequires: python3-libvirt %else BuildRequires: libvirt-python3 %endif -%endif -%endif +%endif # with_tests %description Avocado is a set of tools and libraries (what people call @@ -202,25 +121,12 @@ sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to %endif %build -%if %{with python2} -%py2_build -%endif -%if %{with python3} %py3_build -%endif pushd optional_plugins/html - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/runner_remote %if %{with_fabric} - %if %{with python2} - %py2_build - %endif %if %{with_python3_fabric} %py3_build %endif @@ -228,9 +134,6 @@ pushd optional_plugins/runner_remote popd pushd optional_plugins/runner_vm %if %{with_fabric} - %if %{with python2} - %py2_build - %endif %if %{with_python3_fabric} %py3_build %endif @@ -238,127 +141,54 @@ pushd optional_plugins/runner_vm popd pushd optional_plugins/runner_docker %if %{with_fabric} - %if %{with python2} - %py2_build - %endif %if %{with_python3_fabric} %py3_build %endif %endif # with_fabric popd pushd optional_plugins/resultsdb - %if %{with_python2_resultsdb} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/varianter_yaml_to_mux - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/loader_yaml - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/golang - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/varianter_pict - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/varianter_cit - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/result_upload - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd pushd optional_plugins/glib - %if %{with python2} - %py2_build - %endif - %if %{with python3} %py3_build - %endif popd %{__make} man %install -%if %{with python2} -%py2_install -%{__mv} %{buildroot}%{_bindir}/avocado %{buildroot}%{_bindir}/avocado-%{python2_version} -%{__ln_s} avocado-%{python2_version} %{buildroot}%{_bindir}/avocado-2 -%{__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 -# configuration is held at /etc/avocado only and part of the -# python-avocado-common package -%{__rm} -rf %{buildroot}%{python2_sitelib}/avocado/etc -# ditto for libexec files -%{__rm} -rf %{buildroot}%{python2_sitelib}/avocado/libexec -%endif -%if %{with python3} %py3_install %{__mv} %{buildroot}%{_bindir}/avocado %{buildroot}%{_bindir}/avocado-%{python3_version} %{__ln_s} avocado-%{python3_version} %{buildroot}%{_bindir}/avocado-3 -%{__mv} %{buildroot}%{_bindir}/avocado-rest-client %{buildroot}%{_bindir}/avocado-rest-client-%{python3_version} -%{__ln_s} avocado-rest-client-%{python3_version} %{buildroot}%{_bindir}/avocado-rest-client-3 # configuration is held at /etc/avocado only and part of the # python-avocado-common package %{__rm} -rf %{buildroot}%{python3_sitelib}/avocado/etc # ditto for libexec files %{__rm} -rf %{buildroot}%{python3_sitelib}/avocado/libexec -%endif -%if %{with python3} # Unversioned executables should now be the Python 3 version if shipping with Python 3 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/ %{__ln_s} avocado-%{python3_version} %{buildroot}%{_bindir}/avocado -%{__ln_s} avocado-rest-client-%{python3_version} %{buildroot}%{_bindir}/avocado-rest-client -%else -%{__ln_s} avocado-%{python2_version} %{buildroot}%{_bindir}/avocado -%{__ln_s} avocado-rest-client-%{python2_version} %{buildroot}%{_bindir}/avocado-rest-client -%endif pushd optional_plugins/html - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/runner_remote %if %{with_fabric} - %if %{with python2} - %py2_install - %endif %if %{with_python3_fabric} %py3_install %endif @@ -366,9 +196,6 @@ pushd optional_plugins/runner_remote popd pushd optional_plugins/runner_vm %if %{with_fabric} - %if %{with python2} - %py2_install - %endif %if %{with_python3_fabric} %py3_install %endif @@ -376,85 +203,37 @@ pushd optional_plugins/runner_vm popd pushd optional_plugins/runner_docker %if %{with_fabric} - %if %{with python2} - %py2_install - %endif %if %{with_python3_fabric} %py3_install %endif %endif # with_fabric popd pushd optional_plugins/resultsdb - %if %{with_python2_resultsdb} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/varianter_yaml_to_mux - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/loader_yaml - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/golang - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/varianter_pict - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/varianter_cit - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/result_upload - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd pushd optional_plugins/glib - %if %{with python2} - %py2_install - %endif - %if %{with python3} %py3_install - %endif popd # cleanup plugin test cruft -%if %{with python2} -%{__rm} -rf %{buildroot}%{python2_sitelib}/tests -%endif -%if %{with python3} %{__rm} -rf %{buildroot}%{python3_sitelib}/tests -%endif %{__mkdir} -p %{buildroot}%{_sysconfdir}/avocado %{__cp} avocado/etc/avocado/avocado.conf %{buildroot}%{_sysconfdir}/avocado/avocado.conf %{__cp} -r avocado/etc/avocado/conf.d %{buildroot}%{_sysconfdir}/avocado/conf.d @@ -468,7 +247,6 @@ popd %{__cp} avocado/libexec/avocado_warn %{buildroot}%{_libexecdir}/avocado/avocado_warn %{__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 %{__install} -d -m 0755 %{buildroot}%{_sharedstatedir}/avocado/data # place examples in documentation directory %{__install} -d -m 0755 %{buildroot}%{_docdir}/avocado @@ -485,62 +263,6 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %check %if 0%{?with_tests} - %if %{with python2} - %{__python2} setup.py develop --user - pushd optional_plugins/html - %{__python2} setup.py develop --user - popd - %if %{with_fabric} - pushd optional_plugins/runner_remote - %{__python2} setup.py develop --user - popd - pushd optional_plugins/runner_vm - %{__python2} setup.py develop --user - popd - pushd optional_plugins/runner_docker - %{__python2} setup.py develop --user - popd - %endif # with_fabric - %if %{with_python2_resultsdb} - pushd optional_plugins/resultsdb - %{__python2} setup.py develop --user - popd - %endif # with_python2_resultsdb - pushd optional_plugins/varianter_yaml_to_mux - %{__python2} setup.py develop --user - popd - pushd optional_plugins/loader_yaml - %{__python2} setup.py develop --user - popd - pushd optional_plugins/golang - %{__python2} setup.py develop --user - popd - pushd optional_plugins/varianter_pict - %{__python2} setup.py develop --user - popd - pushd optional_plugins/varianter_cit - %{__python2} setup.py develop --user - popd - pushd optional_plugins/result_upload - %{__python2} setup.py develop --user - popd - pushd optional_plugins/glib - %{__python2} setup.py develop --user - popd - # LANG: to make the results predictable, we pin the language - # that is used during test execution. - # AVOCADO_CHECK_LEVEL: 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 - # UNITTEST_AVOCADO_CMD: the "avocado" command to be run during - # unittests needs to be a Python specific one on Fedora >= 28. Let's - # use the one that was setup in the source tree by the "setup.py - # develop --user" step and is guaranteed to be version specific. - USER_BASE=`%{__python2} -m site --user-base` - LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$USER_BASE/bin/avocado %{__python2} selftests/run - %endif - - %if %{with python3} %{__python3} setup.py develop --user pushd optional_plugins/html %{__python3} setup.py develop --user @@ -582,62 +304,20 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x pushd optional_plugins/glib %{__python3} setup.py develop --user popd + # LANG: to make the results predictable, we pin the language + # that is used during test execution. + # AVOCADO_CHECK_LEVEL: 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 + # UNITTEST_AVOCADO_CMD: the "avocado" command to be run during + # unittests needs to be a Python specific one on Fedora >= 28. Let's + # use the one that was setup in the source tree by the "setup.py + # develop --user" step and is guaranteed to be version specific. USER_BASE=`%{__python3} -m site --user-base` LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$USER_BASE/bin/avocado %{__python3} selftests/run - %endif %endif -%if %{with python2} -%package -n python2-%{pkgname} -Summary: %{summary} -License: GPLv2 and MIT -%{?python_provide:%python_provide python2-%{pkgname}} -Requires: python-%{pkgname}-common == %{version}-%{release} -Requires: gdb -Requires: gdb-gdbserver -Requires: procps-ng -Requires: python2 -Requires: python2-requests -Requires: python2-setuptools -Requires: python2-six -%if 0%{?fedora} || 0%{?rhel} > 7 -Requires: python2-enum34 -Requires: python2-stevedore -%else -Requires: python-enum34 -Requires: python-stevedore -%endif -%if 0%{?fedora} && 0%{?fedora} <= 29 -# Python2 binary packages are being removed -# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal -Requires: python2-pycdlib -%endif -%if 0%{?fedora} && 0%{?fedora} <= 30 -# More Python2 binary packages removed -Requires: pyliblzma -%endif - -%description -n python2-%{pkgname} -Avocado is a set of tools and libraries (what people call -these days a framework) to perform automated testing. - -%files -n python2-%{pkgname} -%license LICENSE -%doc README.rst -%{python2_sitelib}/avocado/ -%{python2_sitelib}/avocado_framework-%{version}-py%{python2_version}.egg-info -%{_bindir}/avocado-%{python2_version} -%{_bindir}/avocado-2 -%{_bindir}/avocado-rest-client-%{python2_version} -%{_bindir}/avocado-rest-client-2 -%if %{without python3} -%{_bindir}/avocado -%{_bindir}/avocado-rest-client -%endif -%endif - -%if %{with python3} %package -n python3-%{pkgname} Summary: %{summary} License: GPLv2 and MIT @@ -648,7 +328,6 @@ Requires: gdb-gdbserver Requires: procps-ng Requires: python3 Requires: python3-pycdlib -Requires: python3-requests Requires: python3-setuptools Requires: python3-six Requires: python3-stevedore @@ -665,10 +344,6 @@ these days a framework) to perform automated testing. %{_bindir}/avocado-%{python3_version} %{_bindir}/avocado-3 %{_bindir}/avocado -%{_bindir}/avocado-rest-client-%{python3_version} -%{_bindir}/avocado-rest-client-3 -%{_bindir}/avocado-rest-client -%endif %package -n python-%{pkgname}-common @@ -679,7 +354,6 @@ Common files (such as configuration) for the Avocado Testing Framework. %files -n python-%{pkgname}-common %{_mandir}/man1/avocado.1.gz -%{_mandir}/man1/avocado-rest-client.1.gz %dir %{_docdir}/avocado %dir %{_sharedstatedir}/avocado %dir %{_sysconfdir}/avocado @@ -700,28 +374,6 @@ Common files (such as configuration) for the Avocado Testing Framework. %{_sysconfdir}/avocado/scripts/job/post.d/README -%if %{with python2} -%package -n python2-%{pkgname}-plugins-output-html -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-jinja2 -%else -Requires: python-jinja2 -%endif - -%description -n python2-%{pkgname}-plugins-output-html -Adds to avocado the ability to generate an HTML report at every job results -directory. It also gives the user the ability to write a report on an -arbitrary filesystem location. - -%files -n python2-%{pkgname}-plugins-output-html -%{python2_sitelib}/avocado_result_html/ -%{python2_sitelib}/avocado_framework_plugin_result_html-%{version}-py%{python2_version}.egg-info -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-output-html Summary: Avocado HTML report plugin %{?python_provide:%python_provide python3-%{pkgname}-plugins-output-html} @@ -736,30 +388,9 @@ arbitrary filesystem location. %files -n python3-%{pkgname}-plugins-output-html %{python3_sitelib}/avocado_result_html/ %{python3_sitelib}/avocado_framework_plugin_result_html-%{version}-py%{python3_version}.egg-info -%endif %if %{with_fabric} -%if %{with python2} -%package -n python2-%{pkgname}-plugins-runner-remote -Summary: Avocado Runner for Remote Execution -%{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-remote} -Requires: python2-%{pkgname} == %{version}-%{release} -%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 -connection. Avocado must be previously installed on the remote machine. - -%files -n python2-%{pkgname}-plugins-runner-remote -%{python2_sitelib}/avocado_runner_remote/ -%{python2_sitelib}/avocado_framework_plugin_runner_remote-%{version}-py%{python2_version}.egg-info -%endif - %if %{with_python3_fabric} %package -n python3-%{pkgname}-plugins-runner-remote Summary: Avocado Runner for Remote Execution @@ -774,33 +405,11 @@ connection. Avocado must be previously installed on the remote machine. %files -n python3-%{pkgname}-plugins-runner-remote %{python3_sitelib}/avocado_runner_remote/ %{python3_sitelib}/avocado_framework_plugin_runner_remote-%{version}-py%{python3_version}.egg-info -%endif +%endif # with_python3_fabric %endif # with_fabric %if %{with_fabric} -%if %{with python2} -%package -n python2-%{pkgname}-plugins-runner-vm -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 -interaction with a libvirt daemon and an SSH connection to the VM -itself. Avocado must be previously installed on the VM. - -%files -n python2-%{pkgname}-plugins-runner-vm -%{python2_sitelib}/avocado_runner_vm/ -%{python2_sitelib}/avocado_framework_plugin_runner_vm-%{version}-py%{python2_version}.egg-info -%endif - %if %{with_python3_fabric} %package -n python3-%{pkgname}-plugins-runner-vm Summary: Avocado Runner for libvirt VM Execution @@ -817,29 +426,11 @@ itself. Avocado must be previously installed on the VM. %files -n python3-%{pkgname}-plugins-runner-vm %{python3_sitelib}/avocado_runner_vm/ %{python3_sitelib}/avocado_framework_plugin_runner_vm-%{version}-py%{python3_version}.egg-info -%endif +%endif # with_python3_fabric %endif # with_fabric %if %{with_fabric} -%if %{with python2} -%package -n python2-%{pkgname}-plugins-runner-docker -Summary: Avocado Runner for Execution on Docker Containers -%{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-docker} -Requires: python2-%{pkgname} == %{version}-%{release} -Requires: python2-%{pkgname}-plugins-runner-remote == %{version}-%{release} -Requires: python2-aexpect - -%description -n python2-%{pkgname}-plugins-runner-docker -Allows Avocado to run jobs on a Docker container by interacting with a -Docker daemon and attaching to the container itself. Avocado must -be previously installed on the container. - -%files -n python2-%{pkgname}-plugins-runner-docker -%{python2_sitelib}/avocado_runner_docker/ -%{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info -%endif - %if %{with_python3_fabric} %package -n python3-%{pkgname}-plugins-runner-docker Summary: Avocado Runner for Execution on Docker Containers @@ -856,28 +447,10 @@ be previously installed on the container. %files -n python3-%{pkgname}-plugins-runner-docker %{python3_sitelib}/avocado_runner_docker/ %{python3_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python3_version}.egg-info -%endif +%endif # with_python3_fabric %endif # with_fabric -%if %{with_python2_resultsdb} -%package -n python2-%{pkgname}-plugins-resultsdb -Summary: Avocado plugin to propagate job results to ResultsDB -%{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb} -Requires: python2-%{pkgname} == %{version}-%{release} -Requires: python2-resultsdb_api - -%description -n python2-%{pkgname}-plugins-resultsdb -Allows Avocado to send job results directly to a ResultsDB -server. - -%files -n python2-%{pkgname}-plugins-resultsdb -%{python2_sitelib}/avocado_resultsdb/ -%{python2_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python2_version}.egg-info -%config(noreplace) %{_sysconfdir}/avocado/conf.d/resultsdb.conf -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-resultsdb Summary: Avocado plugin to propagate job results to ResultsDB %{?python_provide:%python_provide python3-%{pkgname}-plugins-resultsdb} @@ -892,30 +465,8 @@ server. %{python3_sitelib}/avocado_resultsdb/ %{python3_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python3_version}.egg-info %config(noreplace) %{_sysconfdir}/avocado/conf.d/resultsdb.conf -%endif -%if %{with python2} -%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-varianter-yaml-to-mux} -Requires: python2-%{pkgname} == %{version}-%{release} -%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 -Requires: python2-yaml -%else -Requires: python-yaml -%endif - -%description -n python2-%{pkgname}-plugins-varianter-yaml-to-mux -Can be used to produce multiple test variants with test parameters -defined in a yaml file(s). - -%files -n python2-%{pkgname}-plugins-varianter-yaml-to-mux -%{python2_sitelib}/avocado_varianter_yaml_to_mux/ -%{python2_sitelib}/avocado_framework_plugin_varianter_yaml_to_mux-%{version}-py%{python2_version}.egg-info -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-varianter-yaml-to-mux Summary: Avocado plugin to generate variants out of yaml files %{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-yaml-to-mux} @@ -929,25 +480,8 @@ defined in a yaml file(s). %files -n python3-%{pkgname}-plugins-varianter-yaml-to-mux %{python3_sitelib}/avocado_varianter_yaml_to_mux/ %{python3_sitelib}/avocado_framework_plugin_varianter_yaml_to_mux-%{version}-py%{python3_version}.egg-info -%endif -%if %{with python2} -%package -n python2-%{pkgname}-plugins-loader-yaml -Summary: Avocado plugin that loads tests from YAML files -%{?python_provide:%python_provide python2-%{pkgname}-plugins-loader-yaml} -Requires: python2-%{pkgname}-plugins-varianter-yaml-to-mux == %{version}-%{release} - -%description -n python2-%{pkgname}-plugins-loader-yaml -Can be used to produce a test suite from definitions in a YAML file, -similar to the one used in the yaml_to_mux varianter plugin. - -%files -n python2-%{pkgname}-plugins-loader-yaml -%{python2_sitelib}/avocado_loader_yaml/ -%{python2_sitelib}/avocado_framework_plugin_loader_yaml-%{version}-py%{python2_version}.egg-info -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-loader-yaml Summary: Avocado plugin that loads tests from YAML files %{?python_provide:%python_provide python3-%{pkgname}-plugins-loader-yaml} @@ -960,26 +494,8 @@ similar to the one used in the yaml_to_mux varianter plugin. %files -n python3-%{pkgname}-plugins-loader-yaml %{python3_sitelib}/avocado_loader_yaml/ %{python3_sitelib}/avocado_framework_plugin_loader_yaml-%{version}-py%{python3_version}.egg-info -%endif -%if %{with python2} -%package -n python2-%{pkgname}-plugins-golang -Summary: Avocado plugin for execution of golang tests -%{?python_provide:%python_provide python2-%{pkgname}-plugins-golang} -Requires: python2-%{pkgname} == %{version}-%{release} -Requires: golang - -%description -n python2-%{pkgname}-plugins-golang -Allows Avocado to list golang tests, and if golang is installed, -also run them. - -%files -n python2-%{pkgname}-plugins-golang -%{python2_sitelib}/avocado_golang/ -%{python2_sitelib}/avocado_framework_plugin_golang-%{version}-py%{python2_version}.egg-info -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-golang Summary: Avocado plugin for execution of golang tests %{?python_provide:%python_provide python3-%{pkgname}-plugins-golang} @@ -993,25 +509,8 @@ also run them. %files -n python3-%{pkgname}-plugins-golang %{python3_sitelib}/avocado_golang/ %{python3_sitelib}/avocado_framework_plugin_golang-%{version}-py%{python3_version}.egg-info -%endif -%if %{with python2} -%package -n python2-%{pkgname}-plugins-varianter-pict -Summary: Varianter with combinatorial capabilities by PICT -%{?python_provide:%python_provide python2-%{pkgname}-plugins-varianter-pict} -Requires: python2-%{pkgname} == %{version}-%{release} - -%description -n python2-%{pkgname}-plugins-varianter-pict -This plugin uses a third-party tool to provide variants created by -Pair-Wise algorithms, also known as Combinatorial Independent Testing. - -%files -n python2-%{pkgname}-plugins-varianter-pict -%{python2_sitelib}/avocado_varianter_pict/ -%{python2_sitelib}/avocado_framework_plugin_varianter_pict-%{version}-py%{python2_version}.egg-info -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-varianter-pict Summary: Varianter with combinatorial capabilities by PICT %{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-pict} @@ -1024,26 +523,8 @@ Pair-Wise algorithms, also known as Combinatorial Independent Testing. %files -n python3-%{pkgname}-plugins-varianter-pict %{python3_sitelib}/avocado_varianter_pict/ %{python3_sitelib}/avocado_framework_plugin_varianter_pict-%{version}-py%{python3_version}.egg-info -%endif -%if %{with python2} -%package -n python2-%{pkgname}-plugins-varianter-cit -Summary: Varianter with Combinatorial Independent Testing capabilities -%{?python_provide:%python_provide python2-%{pkgname}-plugins-varianter-cit} -Requires: python2-%{pkgname} == %{version}-%{release} - -%description -n python2-%{pkgname}-plugins-varianter-cit -A varianter plugin that generates variants using Combinatorial -Independent Testing (AKA Pair-Wise) algorithm developed in -collaboration with CVUT Prague. - -%files -n python2-%{pkgname}-plugins-varianter-cit -%{python2_sitelib}/avocado_varianter_cit/ -%{python2_sitelib}/avocado_framework_plugin_varianter_cit-%{version}-py%{python2_version}.egg-info -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-varianter-cit Summary: Varianter with Combinatorial Independent Testing capabilities %{?python_provide:%python_provide python3-%{pkgname}-plugins-varianter-cit} @@ -1057,26 +538,8 @@ collaboration with CVUT Prague. %files -n python3-%{pkgname}-plugins-varianter-cit %{python3_sitelib}/avocado_varianter_cit/ %{python3_sitelib}/avocado_framework_plugin_varianter_cit-%{version}-py%{python3_version}.egg-info -%endif -%if %{with python2} -%package -n python2-%{pkgname}-plugins-result-upload -Summary: Avocado plugin propagate job results to a remote host -%{?python_provide:%python_provide python2-%{pkgname}-plugins-result-upload} -Requires: python2-%{pkgname} == %{version}-%{release} - -%description -n python2-%{pkgname}-plugins-result-upload -This optional plugin is intended to upload the Avocado Job results to -a dedicated sever. - -%files -n python2-%{pkgname}-plugins-result-upload -%{python2_sitelib}/avocado_result_upload/ -%{python2_sitelib}/avocado_framework_plugin_result_upload-%{version}-py%{python2_version}.egg-info -%config(noreplace) %{_sysconfdir}/avocado/conf.d/result_upload.conf -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-result-upload Summary: Avocado plugin propagate job results to a remote host %{?python_provide:%python_provide python3-%{pkgname}-plugins-result-upload} @@ -1090,25 +553,8 @@ a dedicated sever. %{python3_sitelib}/avocado_result_upload/ %{python3_sitelib}/avocado_framework_plugin_result_upload-%{version}-py%{python3_version}.egg-info %config(noreplace) %{_sysconfdir}/avocado/conf.d/result_upload.conf -%endif -%if %{with python2} -%package -n python2-%{pkgname}-plugins-glib -Summary: Avocado plugin for execution of GLib Test Framework tests -%{?python_provide:%python_provide python2-%{pkgname}-plugins-glib} -Requires: python2-%{pkgname} == %{version}-%{release} - -%description -n python2-%{pkgname}-plugins-glib -This optional plugin is intended to list and run tests written in the -GLib Test Framework. - -%files -n python2-%{pkgname}-plugins-glib -%{python2_sitelib}/avocado_glib/ -%{python2_sitelib}/avocado_framework_plugin_glib-%{version}-py%{python2_version}.egg-info -%endif - -%if %{with python3} %package -n python3-%{pkgname}-plugins-glib Summary: Avocado plugin for execution of GLib Test Framework tests %{?python_provide:%python_provide python3-%{pkgname}-plugins-glib} @@ -1121,19 +567,13 @@ GLib Test Framework. %files -n python3-%{pkgname}-plugins-glib %{python3_sitelib}/avocado_glib/ %{python3_sitelib}/avocado_framework_plugin_glib-%{version}-py%{python3_version}.egg-info -%endif %package -n python-%{pkgname}-examples Summary: Avocado Test Framework Example Tests License: GPLv2 # documentation does not require main package, but needs to be in lock-step if present -%if %{with python2} -Conflicts: python2-%{pkgname} < %{version}-%{release}, python2-%{pkgname} > %{version}-%{release} -%endif -%if %{with python3} Conflicts: python3-%{pkgname} < %{version}-%{release}, python3-%{pkgname} > %{version}-%{release} -%endif %description -n python-%{pkgname}-examples The set of example tests present in the upstream tree of the Avocado framework. @@ -1170,6 +610,10 @@ Again Shell code (and possibly other similar shells). %changelog +* Wed Jun 26 2019 Merlin Mathesius - 70.0-1 +- Sync with upstream release 70.0. +- Drop all Python 2 support from SPEC file. + * 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..c642ab0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-69.0.tar.gz) = 5353c85d94a9754a6e23eb2b4e1a09dc4f87e3590ff1073383b2b8ac5e2eeb7cddadf5773c762f1dbd8b7a04ed6314f68cf7014acc4e709683f0251518c30b10 +SHA512 (avocado-70.0.tar.gz) = 5098d499ced74905f5a9d0d7c2bafcb9760fd8120dbef4db4245684d59963cf06a246cd860d4a4da00aab5ac949a357e93f5ddaedc1357f2d1bc71705ad8cbe7