From 2265bd365b1e69bc1c085ec10a206485500dbd9ccb0cc701649983e203befaa1 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 31 Oct 2021 16:14:50 +0000 Subject: [PATCH] Accepting request 928389 from home:bnavigator:branches:devel:languages:python - Force pytest5 because it has the pluggy<1 pin patched out OBS-URL: https://build.opensuse.org/request/show/928389 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jedi?expand=0&rev=88 --- python-jedi.changes | 5 +++++ python-jedi.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-jedi.changes b/python-jedi.changes index 0af57cd..511c219 100644 --- a/python-jedi.changes +++ b/python-jedi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 31 15:56:52 UTC 2021 - Benjamin Greiner + +- Force pytest5 because it has the pluggy<1 pin patched out + ------------------------------------------------------------------- Sat Mar 13 13:33:44 UTC 2021 - Ben Greiner diff --git a/python-jedi.spec b/python-jedi.spec index ef76101..a4e4407 100644 --- a/python-jedi.spec +++ b/python-jedi.spec @@ -30,8 +30,8 @@ Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM Support pytest completion for Python 3.9 -- gh#davidhalter/jedi#1699 Patch0: https://github.com/davidhalter/jedi/commit/85ec94cf.patch#/jedi-py39-pytest.patch BuildRequires: %{python_module parso >= 0.8.0} -# need pytest 5 https://github.com/davidhalter/jedi/issues/1660 -BuildRequires: %{python_module pytest < 6.0.0} +# need pytest <6 https://github.com/davidhalter/jedi/issues/1660; pytest4 in Leap cannot work with pluggy 1.0 in :backports +BuildRequires: %{python_module pytest5} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module typing} BuildRequires: fdupes