From 1ad6cd7656d382a66011ebf4dfb950f9bd8a3afa Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Feb 28 2020 20:46:48 +0000 Subject: Merge branch 'master' into epel7 --- diff --git a/.gitignore b/.gitignore index c993772..20376e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /openQA-python-client-184e6c8415ef3b0667caf8f8a440007d6b98ba93.tar.gz /openQA-python-client-080d03858b7b12f144770af8ceb938fe6c7dbb11.tar.gz +/openQA-python-client-1.3.2.tar.gz +/openQA-python-client-2.0.0.tar.gz +/openQA-python-client-3.0.4.tar.gz diff --git a/python-openqa_client.spec b/python-openqa_client.spec index 0e9a71a..9acd1ad 100644 --- a/python-openqa_client.spec +++ b/python-openqa_client.spec @@ -7,8 +7,8 @@ %bcond_with python3 %endif -# Disable Python 2 builds for Fedora > 29, EPEL > 7 -%if 0%{?fedora} > 29 || 0%{?rhel} > 7 +# Disable Python 2 builds for Fedora, EPEL > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 %bcond_with python2 %global obsolete2 1 %else @@ -22,20 +22,20 @@ openQA web API, using the requests HTTP request library. %global github_owner os-autoinst %global github_name openQA-python-client -%global github_version 1.3.1 -%global github_commit 080d03858b7b12f144770af8ceb938fe6c7dbb11 +%global github_version 3.0.4 # if set, will be a post-release snapshot build, otherwise a 'normal' build +#global github_commit 080d03858b7b12f144770af8ceb938fe6c7dbb11 #global github_date 20170130 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: python-openqa_client Version: %{github_version} -Release: 6%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 1%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: %{sum} License: GPLv2+ URL: https://github.com/%{github_owner}/%{github_name}/ -Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz +Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_version}/%{github_name}-%{github_version}.tar.gz BuildArch: noarch %description @@ -47,6 +47,12 @@ BuildArch: noarch Summary: %{sum} BuildRequires: python2-devel BuildRequires: python2-setuptools +# test requirements +BuildRequires: python2-pytest +BuildRequires: python2-freezegun +BuildRequires: python2-mock +BuildRequires: python2-requests +BuildRequires: python2-six %{?python_provide:%python_provide python2-openqa_client} Requires: python2-requests Requires: python2-six @@ -62,6 +68,10 @@ Python 2 build. Summary: %{sum} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-freezegun +BuildRequires: python%{python3_pkgversion}-requests +BuildRequires: python%{python3_pkgversion}-six %{?python_provide:%python_provide python%{python3_pkgversion}-openqa_client} %if 0%{?obsolete2} Obsoletes: python2-openqa_client < %{version}-%{release} @@ -90,7 +100,7 @@ Python %{python3_other_pkgversion} build. %prep -%autosetup -p1 -n %{github_name}-%{github_commit} +%autosetup -p1 -n %{github_name}-%{github_version} %build %if 0%{?with_python2} @@ -114,9 +124,18 @@ Python %{python3_other_pkgversion} build. %endif # with_python3_other %endif # with_python3 - %check -# FIXME: there are no tests yet. Bad me. +# we're not supposed to use setup.py test any more, apparently, but +# the shiny/scary new pyproject-rpm-macros stuff isn't available on +# EPEL yet, so...let's just try and use py.test directly, against +# the path we installed to. +%if 0%{?with_python2} +PYTHONPATH=%{buildroot}%{python2_sitelib} py.test +%endif # with_python3 +%if 0%{?with_python3} +PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 +%endif # with_python3 + %if 0%{?with_python2} %files -n python2-openqa_client @@ -141,8 +160,30 @@ Python %{python3_other_pkgversion} build. %changelog -* Fri Mar 08 2019 Troy Dawson - 1.3.1-6 -- Rebuilt to change main python from 3.4 to 3.6 +* Thu Feb 27 2020 Adam Williamson - 3.0.4-1 +- New release 3.0.4 +- Run tests in %check (now there are some) + +* Thu Jan 30 2020 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 06 2020 Adam Williamson - 2.0.0-1 +- Update to new release 2.0.0 (JOB_INCOMPLETE_RESULTS removed) + +* Thu Oct 03 2019 Miro Hrončok - 1.3.2-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.3.2-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue May 21 2019 Adam Williamson - 1.3.2-1 +- New release 1.3.2 (updated constants for upstream changes) + +* Sat Feb 02 2019 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Fri Nov 23 2018 Adam Williamson - 1.3.1-5 - Disable Python 2 build on F30+ / RHEL 8+ diff --git a/sources b/sources index 17ce3be..6833db7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openQA-python-client-080d03858b7b12f144770af8ceb938fe6c7dbb11.tar.gz) = bfdc06e76dc226177023c28dd8fee74f07a2cb293a69a427e700ea8e8ed61f34edc19b348f9927ef027ddbf2105aa88465c185f0fc92ee36da32c604cc8ba908 +SHA512 (openQA-python-client-3.0.4.tar.gz) = 86078e5651e194bdc034c788b64a6a7c340137f3c86e834ab47e21494797b20dc20680a83fd756c2db2c7ce1594bbaf3727447ff946579a050ab111605ca2db5