Merge pull request #2528 from Kodiologist/pytest-refine

Update `conftest.py`

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
       matrix:
         name-prefix: ['']
         os: [ubuntu-latest]
-        python: [3.8, 3.9, '3.10', 3.11, 3.12-dev, pypy-3.10, pyodide]
+        python: [3.8, 3.9, '3.10', 3.11, 3.12, pypy-3.10, pyodide]
         include:
           # To keep the overall number of runs low, we test Windows and MacOS
           # only on the latest CPython.

conftest.py

@@ -1,19 +1,18 @@
-import importlib
 import os
 from pathlib import Path
 
-import pytest
+import hy, pytest
 
-NATIVE_TESTS = os.path.join("", "tests", "native_tests", "")
+NATIVE_TESTS = Path.cwd() / "tests/native_tests"
 
 # https://github.com/hylang/hy/issues/2029
 os.environ.pop("HYSTARTUP", None)
 
 
-def pytest_collect_file(parent, path):
+def pytest_collect_file(file_path, parent):
     if (
-        path.ext == ".hy"
-        and NATIVE_TESTS in path.dirname + os.sep
-        and path.basename != "__init__.hy"
+        file_path.suffix == ".hy"
+        and NATIVE_TESTS in file_path.parents
+        and file_path.name != "__init__.hy"
     ):
-        return pytest.Module.from_parent(parent, path=Path(path))
+        return pytest.Module.from_parent(parent, path=file_path)

requirements-dev.txt

@@ -1,4 +1,4 @@
-pytest >= 6
+pytest >= 7
 
 # documentation
 Pygments == 2.15.1