1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
|
Description: fix conftest failure with pytest 9.
This patch accommodates pytest_ignore_collect hook signature and
implementation to pytest 9 unconditionally. This may be used as-is
down to pytest 7, but older versions will require more intricate fixes.
Author: Étienne Mollier <emollier@debian.org>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1123284
Forwarded: https://github.com/Parsl/parsl/issues/4051
Last-Update: 2025-12-19
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- python-parsl.orig/parsl/tests/conftest.py
+++ python-parsl/parsl/tests/conftest.py
@@ -367,12 +367,12 @@
return rep
-def pytest_ignore_collect(path):
- if 'integration' in path.strpath:
+def pytest_ignore_collect(collection_path, config):
+ if 'integration' in str(collection_path):
return True
- elif 'manual_tests' in path.strpath:
+ elif 'manual_tests' in str(collection_path):
return True
- elif 'scaling_tests/test_scale' in path.strpath:
+ elif 'scaling_tests/test_scale' in str(collection_path):
return True
else:
return False
|