From 66f75d15abe8df9a204d0e5dd529e39b05816617940dc4a282d7ff60e40b9b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jun 2020 16:45:24 +0000 Subject: [PATCH] Accepting request 816629 from home:bnavigator:branches:devel:languages:python - test import workarounds need rework gh#openSUSE/python-rpm-macros#48 gh#PyCQA/pylint#3636 - do not benchmark, just run the tests once OBS-URL: https://build.opensuse.org/request/show/816629 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pylint?expand=0&rev=110 --- python-pylint.changes | 8 ++++++++ python-pylint.spec | 12 ++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/python-pylint.changes b/python-pylint.changes index 1b9377f..63de3c8 100644 --- a/python-pylint.changes +++ b/python-pylint.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 23 16:28:35 UTC 2020 - Benjamin Greiner + +- test import workarounds need rework + gh#openSUSE/python-rpm-macros#48 + gh#PyCQA/pylint#3636 +- do not benchmark, just run the tests once + ------------------------------------------------------------------- Mon Jun 8 19:33:50 UTC 2020 - Michael Ströder diff --git a/python-pylint.spec b/python-pylint.spec index 9ab4d49..0ea0282 100644 --- a/python-pylint.spec +++ b/python-pylint.spec @@ -94,10 +94,14 @@ done %if %{with tests} %check export LC_ALL="en_US.UTF-8" -%pytest -k "not test_do_not_import_files_from_local_directory" -# workaround for gh#PyCQA/pylint#3636 -export PYTHONPATH="/" -%pytest -k "test_do_not_import_files_from_local_directory" +# this tests needs the local source dir for imports, +# gh#openSUSE/python-rpm-macros#48 +export PYTHONPATH=$(pwd) +%pytest -k test_version +# others must not import from local source dir +# gh#PyCQA/pylint#3636 +export PYTHONPATH="" +%pytest -k "not test_version" --benchmark-disable %endif %files %{python_files}