rpms/python-avocado
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sync with upstream release 62.0. (BZ#1590572)

Browse source 
Correct libvirt dependency for EPEL7/RHEL7
This commit is contained in:
Merlin Mathesius 2018-06-13 16:58:48 -05:00
commit ad2fd25084
6 changed files with 46 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

50
python-avocado.spec
View file

@ -11,10 +11,10 @@
%global gittar %{srcname}-%{version}.tar.gz
%else
%if ! 0%{?commit:1}
%global commit 33560176c773e1d5d0b83aa59fe5d0f5f80a1cc3
%global commit c6ac5529063018ca6df308f8495c71697747e255
%endif
%if ! 0%{?commit_date:1}
%global commit_date 20180425
%global commit_date 20180612
%endif
%global shortcommit %(c=%{commit};echo ${c:0:8})
%global gitrel .%{commit_date}git%{shortcommit}
@ -40,7 +40,7 @@
%endif
Name: python-%{pkgname}
Version: 61.0
Version: 62.0
Release: 1%{?gitrel}%{?dist}
Summary: Framework with tools and libraries for Automated Testing
Group: Development/Tools
@ -55,12 +55,8 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{version}.tar.
%else
Source0: https://github.com/avocado-framework/%{srcname}/archive/%{commit}.tar.gz#/%{gittar}
%endif
# Upstream patch to skip remote functional test if remote plugin is not avilable
# https://github.com/avocado-framework/avocado/commit/0cc70f1c8a41260640dfc7a660c11bcb1a163419
Patch0: avocado-61.0-skip-remote-test-if-plugin-unavailable.patch
# Upstream patch to fix unsuitable data_structures identity check
# https://github.com/avocado-framework/avocado/pull/2632/commits/71d189b6ac032524ca0a76d2ae0446ebeb8317ff
Patch1: avocado-61.0-correct-data_structures-identity-check.patch
# fabric has been renamed to Fabric3 in Rawhide
Patch0: avocado-62.0-rawhide-fabric-renamed.patch
BuildArch: noarch
BuildRequires: procps-ng
@ -69,6 +65,7 @@ BuildRequires: kmod
%if %{with python2}
BuildRequires: python2-aexpect
BuildRequires: python2-devel
BuildRequires: python2-distro
BuildRequires: python2-docutils
BuildRequires: python2-mock
BuildRequires: python2-psutil
@ -99,6 +96,7 @@ BuildRequires: python-stevedore
%if %{with python3}
BuildRequires: python3-aexpect
BuildRequires: python3-devel
BuildRequires: python3-distro
BuildRequires: python3-docutils
BuildRequires: python3-lxml
BuildRequires: python3-mock
@ -115,7 +113,7 @@ BuildRequires: python3-stevedore
BuildRequires: perl-Test-Harness
%if %{with python2}
BuildRequires: python2-yaml
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 7
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
BuildRequires: python2-libvirt
%else
BuildRequires: libvirt-python
@ -123,7 +121,7 @@ BuildRequires: libvirt-python
%endif
%if %{with python3}
BuildRequires: python3-yaml
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 7
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
BuildRequires: python3-libvirt
%else
BuildRequires: libvirt-python3
@ -143,15 +141,10 @@ these days a framework) to perform automated testing.
%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
sed -e "s/'libvirt-python'//" -i optional_plugins/runner_vm/setup.py
%if 0%{?fedora} >= 29
# fabric has been renamed to python2-fabric3
sed -e "s/'fabric'/'fabric3'/" -i optional_plugins/runner_remote/setup.py
%endif
%build
@ -443,10 +436,16 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
pushd optional_plugins/glib
%{__python2} setup.py develop --user
popd
# 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.
LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD="$HOME/.local/bin/avocado" %{__python2} selftests/run
# 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.
LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$HOME/.local/bin/avocado %{__python2} selftests/run
%endif
%if %{with python3}
@ -484,10 +483,7 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
pushd optional_plugins/glib
%{__python3} setup.py develop --user
popd
# 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.
LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD="$HOME/.local/bin/avocado" %{__python3} selftests/run
LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$HOME/.local/bin/avocado %{__python3} selftests/run
%endif
%endif
@ -665,7 +661,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
@ -966,6 +962,10 @@ Again Shell code (and possibly other similar shells).
%changelog
* Wed Jun 13 2018 Merlin Mathesius <mmathesi@redhat.com> - 62.0-1
- Sync with upstream release 62.0. (BZ#1590572)
- Correct libvirt dependency for EPEL7/RHEL7
* Thu May 17 2018 Merlin Mathesius <mmathesi@redhat.com> - 61.0-1
- Sync with upstream release 61.0.
- Packaging updates for Python 3.