Merge branch 'master' into shrink_volume

Author: hrobarts

.github/workflows/build.yml

@@ -138,7 +138,7 @@ jobs:
         mamba-version: "*"
         channels: conda-forge
         conda-remove-defaults: "true"
-    - run: conda install boa conda-verify
+    - run: conda install boa
     - name: conda build
       run: >
         conda mambabuild -c conda-forge -c https://tomography.stfc.ac.uk/conda --override-channels --python=${{ matrix.python-version }}

.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

docs/Makefile

@@ -25,6 +25,7 @@ web:
 	@$(JEKYLLBUILD) -s "$(JEKYLLSRCDIR)" $(JEKYLLOPTS)
 	@ls "$(JEKYLLSRCDIR)"/*.md | xargs -II basename I .md | xargs -II rm -rf "$(BUILDDIR)/I"
 	@rm -rf "$(BUILDDIR)/assets"
+	@rm -rf "$(BUILDDIR)/publications"
 	@mv _site/* "$(BUILDDIR)/"
 dirhtml:
 	@rm -rf "$(BUILDDIR)/$(BUILDSUBDIR)"

docs/mkdemos.py

@@ -21,7 +21,7 @@
 ]
 
 NOTEBOOKS_advanced_links = [
-    "https://github.com/TomographicImaging/CIL-Demos/raw/main/misc/callback_demonstration.ipynb"
+    "https://raw.githubusercontent.com/TomographicImaging/CIL-Demos/refs/heads/main/demos/4_Deep_Dives/01_callbacks.ipynb"
 ]
 
 NOTEBOOKS_usershowcase_links = [

docs/mkversions.py

@@ -7,7 +7,7 @@
 
 baseurl = f'/{getenv("GITHUB_REPOSITORY", "").split("/", 1)[-1]}/'.replace("//", "/")
 docs = Path(__file__).parent
-exclude_paths = ["assets"] + [i.stem for i in (docs / "pages").glob("*.md")]
+exclude_paths = ["assets"] + [i.stem for i in (docs / "pages").glob("*.md")] + [i.stem for i in (docs / "pages").glob("*.html")]
 build = docs / "build"
 versions = [{
     "name": i.name,

docs/pages/_includes/_frontpage-widget.html

@@ -0,0 +1,37 @@
+{% comment %}
+*
+* This file is based on _frontpage-widget.html from the feeling-responsive theme
+* https://github.com/Phlow/feeling-responsive
+* Licensed under MIT License
+* 
+* Customization: Added inline styles to img tags for consistent image sizing
+*
+{% endcomment %}
+
+{% comment %}
+*
+*   First the include captures the url and image in a separate variable to make the code better readable.
+*
+*   These variables are widget_url and widget_image
+*
+{% endcomment %}
+
+{% capture widget_url %}{% if include.widget.url == NULL %}{% elsif include.widget.url contains 'http' %}{{ include.widget.url }}{% else %}{{ site.url }}{{ site.baseurl }}{{ include.widget.url }}{% endif %}{% endcapture %}
+
+{% capture widget_image %}{% if include.widget.image contains 'http' %}{{ include.widget.image }}{% else %}{{ site.urlimg }}{{ include.widget.image }}{% endif %}{% endcapture %}
+
+
+<div class="medium-4 columns frontpage-widget">
+	{% if include.widget.video %}
+		{{ include.widget.video }}
+	{% elsif widget_url == empty %}
+		{% if widget_image != empty %}<img src="{{ widget_image }}" alt="" style="height: 200px; width: 100%; object-fit: contain;" />{% endif %}
+	{% else %}
+		<a href="{{ widget_url }}">
+			{% if widget_image != empty %}<img src="{{ widget_image }}" alt="" style="height: 200px; width: 100%; object-fit: contain;" />{% endif %}
+		</a>
+	{% endif %}
+	<h2 class="font-size-h3 t10">{{ include.widget.title }}</h2>
+	{% if include.widget.text != empty %}<p>{{ include.widget.text }}</p>{% endif %}
+	{% if widget_url != empty %}<p><a class="button tiny radius" href="{{ widget_url }}">{{ site.data.language.more }}</a></p>{% endif %}
+</div>