Merge branch 'main' into modern

Author: takluyver

README.rst

@@ -22,12 +22,16 @@ Usage—you are responsible for ensuring build requirements are available:
 .. code-block:: python
 
     import os
-    import tomli
+    try:
+        import tomllib  # Python >= 3.11 - standard library
+    except ImportError:
+        import tomli as tomllib  # Python <= 3.10
+
     from pyproject_hooks import BuildBackendHookCaller
 
     src = 'path/to/source'  # Folder containing 'pyproject.toml'
     with open(os.path.join(src, 'pyproject.toml'), 'rb') as f:
-        build_sys = tomli.load(f)['build-system']
+        build_sys = tomllib.load(f)['build-system']
 
     print(build_sys['requires'])  # List of static requirements
     # The caller is responsible for installing these and running the hooks in

dev-requirements.txt

@@ -1,5 +1,5 @@
 pytest
 flake8
 testpath
-tomli
 setuptools>=30
+tomli ; python_version<'3.11'

doc/requirements.txt

@@ -1 +1 @@
-tomli
+tomli ; python_version<'3.11'

src/pyproject_hooks/_impl.py

@@ -30,9 +30,9 @@ def __init__(self, traceback):
 class BackendInvalid(Exception):
     """Will be raised if the backend is invalid."""
     def __init__(self, backend_name, backend_path, message):
+        super().__init__(message)
         self.backend_name = backend_name
         self.backend_path = backend_path
-        self.message = message
 
 
 class HookMissing(Exception):

tests/test_call_hooks.py

@@ -7,7 +7,6 @@
 from unittest.mock import Mock
 
 import pytest
-import tomli
 from testpath import assert_isfile, modified_env
 from testpath.tempdir import TemporaryDirectory, TemporaryWorkingDirectory
 
@@ -17,6 +16,7 @@
     UnsupportedOperation,
     default_subprocess_runner,
 )
+from pyproject_hooks._compat import tomllib
 
 SAMPLES_DIR = pjoin(dirname(abspath(__file__)), 'samples')
 BUILDSYS_PKGS = pjoin(SAMPLES_DIR, 'buildsys_pkgs')
@@ -25,7 +25,7 @@
 def get_hooks(pkg, **kwargs):
     source_dir = pjoin(SAMPLES_DIR, pkg)
     with open(pjoin(source_dir, 'pyproject.toml'), 'rb') as f:
-        data = tomli.load(f)
+        data = tomllib.load(f)
     return BuildBackendHookCaller(
         source_dir, data['build-system']['build-backend'], **kwargs
     )

tests/test_hook_fallbacks.py

@@ -2,11 +2,11 @@
 from os.path import join as pjoin
 
 import pytest
-import tomli
 from testpath import assert_isfile, modified_env
 from testpath.tempdir import TemporaryDirectory
 
 from pyproject_hooks import BuildBackendHookCaller, HookMissing
+from pyproject_hooks._compat import tomllib
 
 SAMPLES_DIR = pjoin(dirname(abspath(__file__)), 'samples')
 BUILDSYS_PKGS = pjoin(SAMPLES_DIR, 'buildsys_pkgs')
@@ -15,7 +15,7 @@
 def get_hooks(pkg):
     source_dir = pjoin(SAMPLES_DIR, pkg)
     with open(pjoin(source_dir, 'pyproject.toml'), 'rb') as f:
-        data = tomli.load(f)
+        data = tomllib.load(f)
     return BuildBackendHookCaller(source_dir, data['build-system']['build-backend'])
 
 

tests/test_inplace_hooks.py

@@ -2,10 +2,10 @@
 from os.path import join as pjoin
 
 import pytest
-import tomli
 from testpath import modified_env
 
 from pyproject_hooks import BackendInvalid, BuildBackendHookCaller
+from pyproject_hooks._compat import tomllib
 
 SAMPLES_DIR = pjoin(dirname(abspath(__file__)), 'samples')
 BUILDSYS_PKGS = pjoin(SAMPLES_DIR, 'buildsys_pkgs')
@@ -15,7 +15,7 @@
 def get_hooks(pkg, backend=None, path=None):
     source_dir = pjoin(SAMPLES_DIR, pkg)
     with open(pjoin(source_dir, 'pyproject.toml'), 'rb') as f:
-        data = tomli.load(f)
+        data = tomllib.load(f)
     if backend is None:
         backend = data['build-system']['build-backend']
     if path is None: