#17 Sync with upstream release 85.0
Merged 3 years ago by merlinm. Opened 3 years ago by cleber.
rpms/ cleber/python-avocado latest  into  latest

file modified
+3
@@ -28,3 +28,6 @@ 

  /avocado-79.0.tar.gz

  /avocado-80.0.tar.gz

  /avocado-82.0.tar.gz

+ /avocado-83.0.tar.gz

+ /avocado-84.0.tar.gz

+ /avocado-85.0.tar.gz

file modified
+20 -54
@@ -12,10 +12,10 @@ 

      %global gittar          %{srcname}-%{version}.tar.gz

  %else

      %if ! 0%{?commit:1}

-         %global commit      e97540793998c4f24a16000465dd7fdd213bf2b9

+         %global commit      954ff938991894a73171463d329b6bfa748c6652

      %endif

      %if ! 0%{?commit_date:1}

-         %global commit_date 20200911

+         %global commit_date 20210209

      %endif

      %global shortcommit     %(c=%{commit};echo ${c:0:9})

      %global gitrel          .%{commit_date}git%{shortcommit}
@@ -37,7 +37,7 @@ 

  %endif

  

  Name: python-%{pkgname}

- Version: 82.0

+ Version: 85.0

  Release: 1%{?gitrel}%{?dist}

  Summary: Framework with tools and libraries for Automated Testing

  Group: Development/Tools
@@ -90,7 +90,7 @@ 

  

  %prep

  %setup -q -n %{srcname}-%{gitref}

- %if (0%{?fedora} && 0%{?fedora} < 29) || 0%{?rhel}

+ %if 0%{?rhel}

  sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to_mux/setup.py

  %endif

  
@@ -107,9 +107,6 @@ 

  pushd optional_plugins/varianter_yaml_to_mux

      %py3_build

  popd

- pushd optional_plugins/loader_yaml

-     %py3_build

- popd

  pushd optional_plugins/golang

      %py3_build

  popd
@@ -122,9 +119,6 @@ 

  pushd optional_plugins/result_upload

      %py3_build

  popd

- pushd optional_plugins/glib

-     %py3_build

- popd

  %{__make} man

  

  %install
@@ -160,9 +154,6 @@ 

  pushd optional_plugins/varianter_yaml_to_mux

      %py3_install

  popd

- pushd optional_plugins/loader_yaml

-     %py3_install

- popd

  pushd optional_plugins/golang

      %py3_install

  popd
@@ -175,9 +166,6 @@ 

  pushd optional_plugins/result_upload

      %py3_install

  popd

- pushd optional_plugins/glib

-     %py3_install

- popd

  # cleanup plugin test cruft

  %{__rm} -rf %{buildroot}%{python3_sitelib}/tests

  %{__mkdir} -p %{buildroot}%{_sysconfdir}/avocado
@@ -201,7 +189,6 @@ 

  %{__cp} -r examples/varianter_pict %{buildroot}%{_docdir}/avocado/varianter_pict

  %{__cp} -r examples/wrappers %{buildroot}%{_docdir}/avocado/wrappers

  %{__cp} -r examples/yaml_to_mux %{buildroot}%{_docdir}/avocado/yaml_to_mux

- %{__cp} -r examples/yaml_to_mux_loader %{buildroot}%{_docdir}/avocado/yaml_to_mux_loader

  find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x {} ';'

  

  
@@ -220,9 +207,6 @@ 

      pushd optional_plugins/varianter_yaml_to_mux

          %{__python3} setup.py develop --user

      popd

-     pushd optional_plugins/loader_yaml

-         %{__python3} setup.py develop --user

-     popd

      pushd optional_plugins/golang

          %{__python3} setup.py develop --user

      popd
@@ -235,16 +219,13 @@ 

      pushd optional_plugins/result_upload

          %{__python3} setup.py develop --user

      popd

-     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

      USER_BASE=`%{__python3} -m site --user-base`

-     PATH=$USER_BASE/bin:$PATH LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 %{__python3} selftests/run

+     PATH=$USER_BASE/bin:$PATH LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 %{__python3} selftests/check.py --disable-static-checks --disable-plugin-checks=robot

  %endif

  

  
@@ -373,20 +354,6 @@ 

  %{python3_sitelib}/avocado_framework_plugin_varianter_yaml_to_mux-%{version}-py%{python3_version}.egg-info

  

  

- %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}

- Requires: python3-%{pkgname}-plugins-varianter-yaml-to-mux == %{version}-%{release}

- 

- %description -n python3-%{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 python3-%{pkgname}-plugins-loader-yaml

- %{python3_sitelib}/avocado_loader_yaml/

- %{python3_sitelib}/avocado_framework_plugin_loader_yaml-%{version}-py%{python3_version}.egg-info

- 

- 

  %package -n python3-%{pkgname}-plugins-golang

  Summary: Avocado plugin for execution of golang tests

  %{?python_provide:%python_provide python3-%{pkgname}-plugins-golang}
@@ -400,7 +367,7 @@ 

  %files -n python3-%{pkgname}-plugins-golang

  %{python3_sitelib}/avocado_golang/

  %{python3_sitelib}/avocado_framework_plugin_golang-%{version}-py%{python3_version}.egg-info

- 

+ %{_bindir}/avocado-runner-golang

  

  %package -n python3-%{pkgname}-plugins-varianter-pict

  Summary: Varianter with combinatorial capabilities by PICT
@@ -445,20 +412,6 @@ 

  %{python3_sitelib}/avocado_framework_plugin_result_upload-%{version}-py%{python3_version}.egg-info

  

  

- %package -n python3-%{pkgname}-plugins-glib

- Summary: Avocado plugin for execution of GLib Test Framework tests

- %{?python_provide:%python_provide python3-%{pkgname}-plugins-glib}

- Requires: python3-%{pkgname} == %{version}-%{release}

- 

- %description -n python3-%{pkgname}-plugins-glib

- This optional plugin is intended to list and run tests written in the

- 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

- 

- 

  %package -n python-%{pkgname}-examples

  Summary: Avocado Test Framework Example Tests

  License: GPLv2
@@ -479,7 +432,6 @@ 

  %{_docdir}/avocado/varianter_pict

  %{_docdir}/avocado/wrappers

  %{_docdir}/avocado/yaml_to_mux

- %{_docdir}/avocado/yaml_to_mux_loader

  

  

  %package -n python-%{pkgname}-bash
@@ -500,6 +452,20 @@ 

  

  

  %changelog

+ * Wed Feb 10 2021 Cleber Rosa <cleber@redhat.com> - 85.0-1

+ - Sync with upstream release 85.0.

+ 

+ * Wed Feb 10 2021 Cleber Rosa <cleber@redhat.com> - 84.0-1

+ - Sync with upstream release 84.0.

+ - Drop old Fedora conditionals

+ - Use selftests/check.py job instead of more limited selftests/run

+ 

+ * Tue Nov 17 2020 Cleber Rosa <cleber@redhat.com> - 83.0-1

+ - Sync with upstream release 83.0.

+ - Added avocado-runner-golang script to golang package

+ - Removed glib plugin

+ - Removed yaml to mux loader plugin

+ 

  * Mon Sep 14 2020 Cleber Rosa <cleber@redhat.com> - 82.0-1

  - Sync with upstream release 82.0.

  - Removed python libvirt depedency as the vm runner has been removed

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (avocado-82.0.tar.gz) = 099ab131b2b941602550e71507e4ca517d5d2cd5152b255edace0473c9de93aac8163a61689414b5b58f9211f58981c3c30c1c3ca8a191283f609722ce07f173

+ SHA512 (avocado-85.0.tar.gz) = 16134248fa5300cc861419f1c371cd7e2c00c25b6275c288185d04e4290bde44b6d687d05ca4e224cb910e48de1fb39195e9f2e3a08900d5f33d5cd227ed6f1f

Sync with upstream release 85.0, including the previous updates 83.0 and 84.0.

Pull-Request has been merged by merlinm

3 years ago