Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# WARNING: Do not edit this file manually.
# Any changes will be overwritten by Copier.
_commit: v0.11.4
_commit: v0.13.1-4-g190905c
_src_path: gh:easyscience/templates
app_docs_url: https://easyscience.github.io/imaging-app
app_doi: 10.5281/zenodo.18163581
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,14 @@ jobs:

# Build the static files for the documentation site for local inspection
# Input: docs/ directory containing the Markdown files
# Output: site/ directory containing the generated HTML files
# Output: docs/site/ directory containing the generated HTML files
# Also verifies that mkdocstrings generated docs/site/objects.inv.
- name: Build site for local check
run: pixi run docs-build-local
run: |
pixi run docs-build-local
pixi run docs-inventory-check

# Upload the static files from the site/ directory to be used for
# Upload the static files from the docs/site/ directory to be used for
# local check
- name: Upload built site as artifact
uses: ./.github/actions/upload-artifact
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/pypi-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,15 @@ jobs:
frozen: false

- name: Init pixi project
run: pixi init easyimaging
run:
pixi init --platform linux-64 --platform osx-arm64 --platform win-64
easyimaging

- name: Set the minimum system requirements
- name: Configure pixi platforms
working-directory: easyimaging
run: pixi project system-requirements add macos 14.0
run: |
pixi workspace platform edit linux-64 --glibc 2.35 --no-install
pixi workspace platform edit osx-arm64 --macos 14.0 --no-install

- name: Add Python 3.13 from Conda
working-directory: easyimaging
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,16 @@ jobs:
echo "🔹🔸🔹🔸🔹 Python: $py_ver 🔹🔸🔹🔸🔹"

echo "Initializing pixi project"
pixi init easyimaging_py$py_ver
pixi init --platform linux-64 --platform osx-arm64 --platform win-64 easyimaging_py$py_ver
cd easyimaging_py$py_ver

echo "Configure pixi platforms"
pixi workspace platform edit linux-64 --glibc 2.35 --no-install
pixi workspace platform edit osx-arm64 --macos 14.0 --no-install

echo "Adding Python $py_ver"
pixi add "python=$py_ver"

echo "Setting macOS 14.0 as minimum required"
pixi project system-requirements add macos 14.0

echo "Looking for wheel in ../dist/py$py_ver/"
ls -l "../dist/py$py_ver/"

Expand Down
33 changes: 33 additions & 0 deletions docs/docs/assets/stylesheets/extra.css
Original file line number Diff line number Diff line change
Expand Up @@ -364,3 +364,36 @@ h1 .label-experiment {
.label-experiment:hover {
color: white !important;
}

/*
* FontAwesome 5 icon fix for Jupyter widget toolbars (ipympl / plopp)
* This is a temporary workaround until this is fixed on Plopps side
*
* Comment on the issue from Claude:
* embed-amd.js injects FA5 SVG-framework CSS inline, which intentionally sets
* content:"" on all icon classes (expecting FA5 JS to replace elements with SVGs).
* Since FA5 JS conflicts with RequireJS (breaking widget rendering), we instead:
* 1. Load FA5 webfonts via <link> in overrides/main.html so the font file is available.
* 2. Use !important below to override the content:"" with the correct FA5 Solid glyphs.
*/
.fa::before {
font-family: "Font Awesome 5 Free" !important;
font-weight: 900 !important;
}
.fa-home::before { content: "\f015" !important; }
.fa-save::before { content: "\f0c7" !important; }
.fa-camera::before { content: "\f030" !important; }
.fa-cube::before { content: "\f1b2" !important; }
.fa-arrows-alt::before { content: "\f0b2" !important; }
.fa-arrows::before { content: "\f0b2" !important; } /* FA5 equivalent: arrows-alt */
.fa-times::before { content: "\f00d" !important; }
.fa-plus::before { content: "\f067" !important; }
.fa-minus::before { content: "\f068" !important; }
.fa-search-plus::before { content: "\f00e" !important; }
.fa-crosshairs::before { content: "\f05b" !important; }
.fa-arrow-left::before { content: "\f060" !important; }
.fa-arrow-right::before { content: "\f061" !important; }
.fa-expand::before { content: "\f065" !important; }
.fa-compress::before { content: "\f066" !important; }
/* fa-arrows-v was removed in FA5; map to arrows-alt-v (\f338) */
.fa-arrows-v::before { content: "\f338" !important; }
7,515 changes: 7,385 additions & 130 deletions docs/docs/tutorials/measurement.ipynb

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions docs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ plugins:
show_submodules: true
show_source: false
show_bases: false
# Uncomment when the project depends on `easyscience` and inherited
# EasyScience base-class members should be shown in the API docs.
preload_modules:
- easyscience
inherited_members: true
Expand All @@ -169,11 +171,11 @@ plugins:
summary: true
relative_crossrefs: true
scoped_crossrefs: true
filters: ['!^_[^_]', '!__repr__', '!__dir__']
filters: ['!^_[^_]', '!__repr__', '!__dir__'] # This is the default filter minus __repr__ and __dir__
inventories:
- url: https://scipp.github.io/objects.inv
- url: https://numpy.org/doc/stable/objects.inv
- url: https://easyscience.github.io/core/2.3.1/objects.inv
- url: https://easyscience.github.io/core/latest/objects.inv
- url: https://scipp.github.io/scitiff/objects.inv
- url: https://scipp.github.io/plopp/objects.inv
- search
Expand Down
7 changes: 7 additions & 0 deletions docs/overrides/main.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{% extends "base.html" %}

{% block extrahead %}
{{ super() }}
{# FA5 webfonts: provides the "Font Awesome 5 Free" font-face needed by Jupyter widget toolbars.
The !important content overrides in extra.css fix the icons; this supplies the font file. #}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
{% endblock %}

{% block content %}

{% if page.nb_url %}
Expand Down
Loading
Loading