From 331634a5f8108845b37e49b7478853d4b63d4717e2dd1ee72273e6994b9a5605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 18 Jul 2019 09:22:29 +0000 Subject: [PATCH 1/2] - Pin pytest3 for now, pytest4 and 5 work fine in upstream git and will be solved with next release OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=52 --- python-setuptools_scm.changes | 6 ++++++ python-setuptools_scm.spec | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 638fcdd..08f99af 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 18 09:21:17 UTC 2019 - Tomáš Chvátal + +- Pin pytest3 for now, pytest4 and 5 work fine in upstream git + and will be solved with next release + ------------------------------------------------------------------- Tue May 14 11:26:42 UTC 2019 - Marketa Calabkova diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 17ef7ff..cc5a37e 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -19,16 +19,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" -%define test 1 +%define psuffix -test %bcond_without test %else +%define psuffix %{nil} %bcond_with test %endif -%if %{with test} -Name: python-setuptools_scm-%{flavor} -%else -Name: python-setuptools_scm -%endif +Name: python-setuptools_scm%{psuffix} Version: 3.3.3 Release: 0 Summary: Python setuptools handler for SCM tags @@ -45,7 +42,7 @@ BuildArch: noarch %if %{with test} # Testing requirements BuildRequires: %{python_module pip} -BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytest3} BuildRequires: %{python_module setuptools_scm = %{version}} BuildRequires: git-core %endif From e87ea9f10e2f864c1670438757bab28030db205be20c9647df11d56cd440d519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 Jul 2019 09:04:04 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=53 --- python-setuptools_scm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index cc5a37e..3dc6814 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -42,7 +42,7 @@ BuildArch: noarch %if %{with test} # Testing requirements BuildRequires: %{python_module pip} -BuildRequires: %{python_module pytest3} +BuildRequires: %{python_module pytest < 4.0} BuildRequires: %{python_module setuptools_scm = %{version}} BuildRequires: git-core %endif