From 7d643de3a32877386f783243349ddd5be94476ff43eee654f469065dbf14928c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Sep 2019 07:37:27 +0000 Subject: [PATCH] Accepting request 730897 from home:jayvdb:py3only - Add a temporary hack in the spec to alter the conftest.py used when testing the plugin, fixing the builds. - Remove unnecessary build dependency on python-devel OBS-URL: https://build.opensuse.org/request/show/730897 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-trio?expand=0&rev=3 --- python-pytest-trio.changes | 7 +++++++ python-pytest-trio.spec | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/python-pytest-trio.changes b/python-pytest-trio.changes index dc4e2e2..7ddb97e 100644 --- a/python-pytest-trio.changes +++ b/python-pytest-trio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 14 11:52:57 UTC 2019 - John Vandenberg + +- Add a temporary hack in the spec to alter the conftest.py used + when testing the plugin, fixing the builds. +- Remove unnecessary build dependency on python-devel + ------------------------------------------------------------------- Sat May 11 19:30:37 UTC 2019 - Torsten Gruner diff --git a/python-pytest-trio.spec b/python-pytest-trio.spec index de72e26..5d6897d 100644 --- a/python-pytest-trio.spec +++ b/python-pytest-trio.spec @@ -26,7 +26,6 @@ License: MIT OR Apache-2.0 Group: Development/Languages/Python URL: https://github.com/python-trio/pytest-trio Source: file:///home/herman/OBS/home:Simmphonie:python/python-pytest-trio/pytest-trio-%{version}.tar.gz#/pytest-trio-%{version}.tar.gz -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -49,6 +48,10 @@ This is a pytest plugin to help you test projects that use Trio, a friendly libr %prep %setup -q -n pytest-trio-%{version} +# Temporary hack on a temporary hack +# https://github.com/pytest-dev/pytest/issues/4039 +sed -i /RemovedInPytest4Warning/d pytest_trio/_tests/conftest.py + %build %python_build