From e822fc55755f3ee843a624300d16a5cefd0b1c8a9e1e0c64cd63a262b8cb5ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 22 Mar 2019 10:25:28 +0000 Subject: [PATCH] Accepting request 687538 from home:jayvdb:coala:test-rig - Remove dependency on contextlib2 on Python 3 OBS-URL: https://build.opensuse.org/request/show/687538 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-shutil?expand=0&rev=3 --- python-pytest-shutil.changes | 5 +++++ python-pytest-shutil.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python-pytest-shutil.changes b/python-pytest-shutil.changes index a391759..96419e6 100644 --- a/python-pytest-shutil.changes +++ b/python-pytest-shutil.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 22 07:23:42 UTC 2019 - John Vandenberg + +- Remove dependency on contextlib2 on Python 3 + ------------------------------------------------------------------- Wed Feb 20 11:52:07 UTC 2019 - Tomáš Chvátal diff --git a/python-pytest-shutil.spec b/python-pytest-shutil.spec index a1c0835..6df5ec7 100644 --- a/python-pytest-shutil.spec +++ b/python-pytest-shutil.spec @@ -25,7 +25,6 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/manahl/pytest-plugins Source: https://files.pythonhosted.org/packages/source/p/pytest-shutil/pytest-shutil-%{version}.tar.gz -BuildRequires: %{python_module contextlib2} BuildRequires: %{python_module execnet} BuildRequires: %{python_module mock} BuildRequires: %{python_module path.py} @@ -35,15 +34,19 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: %{python_module termcolor} BuildRequires: fdupes +BuildRequires: python-contextlib2 BuildRequires: python-rpm-macros -Requires: python-contextlib2 Requires: python-execnet Requires: python-mock Requires: python-path.py Requires: python-pytest Requires: python-six Requires: python-termcolor +%ifpython2 +Requires: python-contextlib2 +%endif BuildArch: noarch + %python_subpackages %description @@ -53,6 +56,7 @@ tools for automated tests. %prep %setup -q -n pytest-shutil-%{version} sed -i -e 's:pytest<4.0.0:pytest:g' setup.py +sed -i '/contextlib2/d' setup.py %build %python_build