Merge branch 'master' into update_dev_instructions

Author: paskino

.gitignore

@@ -1,6 +1,5 @@
 /build*
 __pycache__/
-/Wrappers/Python/cil/version.py
 /Wrappers/Python/cil-*.dist-info/
 /Wrappers/Python/cil/include/
 /Wrappers/Python/cil/lib/

CHANGELOG.md

@@ -4,6 +4,8 @@
   - Bug fixes:
     - `CentreOfRotationCorrector.image_sharpness` data is now correctly smoothed to reduce aliasing artefacts and improve robustness. (#2202)
     - `PaganinProcessor` now correctly applies scaling with magnification for cone-beam geometry (#2225)
+    - `cilacc` path lookup no longer broken for editable installations (#2257)
+    - update `version.py` to use `importlib` & fix tagless installation #2255 (#2269)
   - Dependencies:
     - olefile and dxchange are optional dependencies, instead of required (#2209)
     - improve `tqdm` notebook support (#2241)

NOTICE.txt

@@ -81,6 +81,7 @@ Francis M Watson (2025) - 3
 Hussam Alhassan (2025) - 1
 Adam Doherty (2025) - 5
 Evan Kiely (2025) - 10
+Jeppe Klitgaard (2026) - 2
 
 CIL Advisory Board:
 Llion Evans - 9

Wrappers/Python/cil/framework/cilacc.py

@@ -17,10 +17,11 @@
 # CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt
 # Joshua DM Hellier (University of Manchester) [refactorer]
 import ctypes
-from pathlib import Path
+from importlib.metadata import distribution
 
 try:
-    cilacc_path = next((Path(__file__).parent.parent / 'lib').resolve().glob("*cilacc.*"))
+    dist = distribution("cil").locate_file("cil/lib")
+    cilacc_path = next(dist.glob("*cilacc.*"))
 except StopIteration:
     raise FileNotFoundError("cilacc library not found")
 cilacc = ctypes.cdll.LoadLibrary(str(cilacc_path))

Wrappers/Python/cil/version.py

@@ -0,0 +1,8 @@
+import importlib.metadata
+from packaging.version import Version
+version = importlib.metadata.version("cil")
+
+__v = Version(version)
+major, minor, patch = __v.major, __v.minor, __v.micro
+commit_hash = "" if __v.local is None else __v.local.split(".", 1)[0]
+num_commit = __v.dev or 9_999

pyproject.toml

@@ -16,22 +16,6 @@ sdist.exclude = ["scripts", "docs", "Wrappers/Python/data", "Wrappers/Python/tes
 [tool.scikit-build.wheel.packages]
 cil = "Wrappers/Python/cil"
 
-[tool.setuptools_scm]
-version_file = "Wrappers/Python/cil/version.py"
-version_file_template = """
-version = '{version}'
-major = {version_tuple[0]}
-minor = {version_tuple[1]}
-patch = {version_tuple[2]}
-commit_hash = '{scm_version.node}'
-num_commit = {scm_version.distance}
-# work-around for https://github.com/pypa/setuptools_scm/issues/1059
-if (commit_hash, num_commit) == ('None', 0):
-    import re
-    if (_v := re.search(r'\\.dev(\\d+)\\+(\\w+)', version)):
-        num_commit, commit_hash = int(_v.group(1)), _v.group(2)
-"""
-
 [tool.setuptools]
 package-dir = {"" = "Wrappers/Python"}
 
@@ -68,6 +52,7 @@ dependencies = [
     "pywavelets",
     "scipy>=1.4.0",
     "tqdm",
+    "packaging",
 ]
 [project.optional-dependencies]
 plugins = [