Use importlib mode for pytest

changelog.d/changed/importlib_mode_pytest.md

@@ -0,0 +1 @@
+- Tests now use [`--import-mode=importlib`](https://docs.pytest.org/en/stable/explanation/goodpractices.html#which-import-mode).

pyproject.toml

@@ -139,7 +139,7 @@ use_parentheses = true
 line_length = 80
 
 [tool.pytest.ini_options]
-addopts = "--doctest-modules"
+addopts = "--doctest-modules --import-mode=importlib"
 
 [tool.mypy]
 files = [

tests/test_global_licensing.py

@@ -9,7 +9,6 @@
 from pathlib import Path
 
 import pytest
-from conftest import RESOURCES_DIRECTORY, posix
 from debian.copyright import Copyright
 from license_expression import LicenseSymbol
 
@@ -26,6 +25,8 @@
  ReuseTOML,
 )
 
+from .conftest import RESOURCES_DIRECTORY, posix
+
 # REUSE-IgnoreStart
 
 # pylint: disable=redefined-outer-name,too-many-lines

tests/test_lint.py

@@ -9,12 +9,12 @@
 import re
 import shutil
 
-from conftest import cpython, posix
-
 from reuse.lint import format_lines, format_plain
 from reuse.project import Project
 from reuse.report import ProjectReport
 
+from .conftest import cpython, posix
+
 # REUSE-IgnoreStart
 
 

tests/test_main.py

@@ -24,14 +24,15 @@
 from urllib.error import URLError
 
 import pytest
-from conftest import RESOURCES_DIRECTORY
 from freezegun import freeze_time
 
 from reuse import download
 from reuse._main import main
 from reuse._util import GIT_EXE, HG_EXE, PIJUL_EXE, cleandoc_nl
 from reuse.report import LINT_VERSION
 
+from .conftest import RESOURCES_DIRECTORY
+
 # REUSE-IgnoreStart
 
 

tests/test_project.py

@@ -14,7 +14,6 @@
 from pathlib import Path
 
 import pytest
-from conftest import RESOURCES_DIRECTORY, posix
 from license_expression import LicenseSymbol
 
 from reuse import ReuseInfo, SourceType
@@ -26,6 +25,8 @@
 )
 from reuse.project import GlobalLicensingConflict, Project
 
+from .conftest import RESOURCES_DIRECTORY, posix
+
 # REUSE-IgnoreStart
 
 

tests/test_report.py

@@ -13,12 +13,12 @@
 from inspect import cleandoc
 from textwrap import dedent
 
-from conftest import cpython, posix
-
 from reuse import SourceType
 from reuse.project import Project
 from reuse.report import FileReport, ProjectReport
 
+from .conftest import cpython, posix
+
 # REUSE-IgnoreStart
 
 

tests/test_util.py

@@ -18,11 +18,12 @@
 
 import pytest
 from boolean.boolean import ParseError
-from conftest import no_root, posix
 
 from reuse import _util
 from reuse._util import _LICENSING
 
+from .conftest import no_root, posix
+
 # REUSE-IgnoreStart