build: update to pybind11 3, modernize python (#294)

* update to pybind11 3

* update mypy, adjust typing

Author: lgray

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
   rev: v2.31.0
   hooks:
   - id: pyupgrade
-    args: ["--py36-plus"]
+    args: ["--py38-plus"]
 
 - repo: https://github.com/pycqa/flake8
   rev: 7.0.0
@@ -37,7 +37,7 @@ repos:
     additional_dependencies: [flake8-bugbear, flake8-print]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.4.1
+  rev: v1.17.1
   hooks:
   - id: mypy
     files: src

pybind11

@@ -72,6 +72,9 @@ convert = [
   "scipy",
 ]
 
+[tool.mypy]
+python_version = "3.9"
+
 [project.scripts]
 correction = "correctionlib.cli:main"
 

pyproject.toml

@@ -1,14 +1,7 @@
-import sys
-from typing import List, Optional, Union
+from typing import List, Literal, Optional, Union
 
 from pydantic import BaseModel, ConfigDict
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
-
 VERSION = 1
 
 

src/correctionlib/schemav1.py

@@ -22,12 +22,10 @@
 
 if sys.version_info >= (3, 9):
     from typing import Annotated, Literal
-elif sys.version_info >= (3, 8):
+else:
     from typing import Literal
 
     from typing_extensions import Annotated
-else:
-    from typing_extensions import Annotated, Literal
 
 
 VERSION = 2

src/correctionlib/schemav2.py

@@ -1,3 +1,4 @@
+import importlib.resources
 import pathlib
 import sys
 
@@ -10,6 +11,11 @@ def this_module_path() -> pathlib.Path:
         import pkg_resources
 
         return pathlib.Path(pkg_resources.resource_filename("correctionlib", ""))
-    import importlib.resources
 
-    return importlib.resources.files("correctionlib")
+    # get a real path out of the traversable
+    paths = [
+        p
+        for p in importlib.resources.files("correctionlib").iterdir()
+        if isinstance(p, pathlib.Path)
+    ]
+    return pathlib.Path(paths[0].parent)