From 566364403d7bd3d28a82809f0216d9fc5f299f97 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 5 Feb 2019 16:37:01 -0600 Subject: [PATCH 1/2] python2-resultsdb_api package has been removed in F30 as part of https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal so python2-avocado-plugins-resultsdb has also been disabled. Signed-off-by: Merlin Mathesius --- python-avocado.spec | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/python-avocado.spec b/python-avocado.spec index 648ef0d..a5a371d 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -32,9 +32,17 @@ %global with_tests 0 %endif +# Python2 binary packages are being removed +# See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal +%if (0%{?fedora} && 0%{?fedora} <= 29) || (0%{?rhel} && 0%{?rhel} <= 7) +%global with_resultsdb 1 +%else +%global with_resultsdb 0 +%endif + Name: python-%{pkgname} Version: 52.1 -Release: 7%{?gitrel}%{?dist} +Release: 8%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -56,7 +64,6 @@ BuildArch: noarch BuildRequires: python2-aexpect BuildRequires: python2-devel BuildRequires: python2-mock -BuildRequires: python2-resultsdb_api BuildRequires: /usr/bin/rst2man BuildRequires: grep, sed @@ -74,6 +81,9 @@ BuildRequires: python2-fabric3 %else BuildRequires: fabric %endif +%if %{with_resultsdb} +BuildRequires: python2-resultsdb_api +%endif %if 0%{?with_tests} BuildRequires: perl(TAP::Parser) @@ -240,6 +250,7 @@ Docker daemon and attaching to the container itself. Avocado must be previously installed on the container. +%if %{with_resultsdb} %package -n python2-%{pkgname}-plugins-resultsdb Summary: Avocado plugin to propagate job results to ResultsDB %{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb} @@ -249,6 +260,7 @@ Requires: python2-resultsdb_api %description -n python2-%{pkgname}-plugins-resultsdb Allows Avocado to send job results directly to a ResultsDB server. +%endif %package -n python2-%{pkgname}-plugins-varianter-yaml-to-mux @@ -310,9 +322,11 @@ popd pushd optional_plugins/runner_docker %{__python2} setup.py build popd +%if %{with_resultsdb} pushd optional_plugins/resultsdb %{__python2} setup.py build popd +%endif pushd optional_plugins/varianter_yaml_to_mux %{__python2} setup.py build popd @@ -332,9 +346,11 @@ popd pushd optional_plugins/runner_docker %{__python2} setup.py install --root %{buildroot} --skip-build popd +%if %{with_resultsdb} pushd optional_plugins/resultsdb %{__python2} setup.py install --root %{buildroot} --skip-build popd +%endif pushd optional_plugins/varianter_yaml_to_mux %{__python2} setup.py install --root %{buildroot} --skip-build popd @@ -370,9 +386,11 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x pushd optional_plugins/runner_docker %{__python2} setup.py develop --user popd + %if %{with_resultsdb} pushd optional_plugins/resultsdb %{__python2} setup.py develop --user popd + %endif pushd optional_plugins/varianter_yaml_to_mux %{__python2} setup.py develop --user popd @@ -445,9 +463,11 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info +%if %{with_resultsdb} %files -n python2-%{pkgname}-plugins-resultsdb %{python2_sitelib}/avocado_resultsdb/ %{python2_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python2_version}.egg-info +%endif %files -n python2-%{pkgname}-plugins-varianter-yaml-to-mux @@ -462,6 +482,11 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Tue Feb 05 2019 Merlin Mathesius - 52.1-8 +- python2-resultsdb_api package has been removed in F30 as part of + https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + so python2-avocado-plugins-resultsdb has also been disabled. + * Fri Jul 13 2018 Fedora Release Engineering - 52.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c93da4c7698f7401fa31369bf4b856576bc1f339 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 19 Mar 2019 16:24:27 -0500 Subject: [PATCH 2/2] python2-sphinx is no longer available or needed as of F31 Signed-off-by: Merlin Mathesius --- python-avocado.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-avocado.spec b/python-avocado.spec index a5a371d..84e605b 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -42,7 +42,7 @@ Name: python-%{pkgname} Version: 52.1 -Release: 8%{?gitrel}%{?dist} +Release: 9%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing # Found licenses: @@ -109,7 +109,10 @@ BuildRequires: python-stevedore BuildRequires: python2-psutil BuildRequires: python2-requests BuildRequires: python2-setuptools +%if 0%{?fedora} && 0%{?fedora} <= 30 +# python2-sphinx is no longer available or needed as of F31 BuildRequires: python2-sphinx +%endif BuildRequires: python2-stevedore %endif @@ -482,6 +485,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Tue Mar 19 2019 Merlin Mathesius - 52.1-9 +- python2-sphinx is no longer available or needed as of F31 + * Tue Feb 05 2019 Merlin Mathesius - 52.1-8 - python2-resultsdb_api package has been removed in F30 as part of https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal