Skip to content

Commit ea2d4a8

Browse files
Merge pull request #192 from easyscience/develop
πŸŽ‰ Release: merge develop into master
2 parents 9fb9383 + 4118ef6 commit ea2d4a8

536 files changed

Lines changed: 117995 additions & 13337 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

β€Ž.codecov.ymlβ€Ž

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
github_checks:
55
annotations: true
66

7+
ignore:
8+
- 'src/easydiffraction/report/templates/html/vendor/**'
9+
- 'src/easydiffraction/report/templates/tex/styles/**'
10+
- 'src/easydiffraction/utils/_vendored/jupyter_dark_detect/**'
11+
712
comment:
813
layout: 'reach, diff, flags, files'
914
behavior: default

β€Ž.codefactorignoreβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# CodeFactor exclude patterns configuration must be done online:
22
# https://www.codefactor.io/repository/github/easyscience/diffraction-lib/ignore
33
#
4-
# Last updated: 2026-01-05
4+
# Last updated: 2026-05-29
55
#
66
# Exclude patterns:
77
# deps/**
88
# docs/**
9+
# src/easydiffraction/report/templates/html/vendor/**
10+
# src/easydiffraction/report/templates/tex/styles/**
911
# src/easydiffraction/utils/_vendored/jupyter_dark_detect/**
1012
# tests/**
1113
# tmp/**

β€Ž.copier-answers.ymlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# WARNING: Do not edit this file manually.
22
# Any changes will be overwritten by Copier.
3-
_commit: v0.11.4
3+
_commit: v0.12.0
44
_src_path: gh:easyscience/templates
55
app_docs_url: https://easyscience.github.io/diffraction-app
66
app_doi: 10.5281/zenodo.18163581

β€Ž.github/copilot-instructions.mdβ€Ž

Lines changed: 0 additions & 224 deletions
This file was deleted.

β€Ž.github/workflows/coverage.ymlβ€Ž

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,8 @@ jobs:
6363
files: ./coverage-unit.xml
6464
token: ${{ secrets.CODECOV_TOKEN }}
6565

66-
# Job 2: Run integration tests with coverage and upload to Codecov
67-
integration-tests-coverage:
68-
runs-on: ubuntu-latest
69-
70-
steps:
71-
- name: Check-out repository
72-
uses: actions/checkout@v6
73-
74-
- name: Set up pixi
75-
uses: ./.github/actions/setup-pixi
76-
77-
- name: Run integration tests with coverage
78-
run:
79-
pixi run integration-tests-coverage --cov-report=xml:coverage-integration.xml
80-
81-
- name: Upload integration tests coverage to Codecov
82-
if: ${{ !cancelled() }}
83-
uses: ./.github/actions/upload-codecov
84-
with:
85-
name: integration-tests-job
86-
flags: integration
87-
files: ./coverage-integration.xml
88-
token: ${{ secrets.CODECOV_TOKEN }}
89-
9066
# Job 4: Build and publish dashboard (reusable workflow)
9167
run-reusable-workflows:
92-
needs: [docstring-coverage, unit-tests-coverage, integration-tests-coverage] # depend on the previous jobs
68+
needs: [docstring-coverage, unit-tests-coverage] # depend on the previous jobs
9369
uses: ./.github/workflows/dashboard.yml
9470
secrets: inherit

β€Ž.github/workflows/docs.ymlβ€Ž

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ jobs:
121121
# if: false # Temporarily disabled to speed up the docs build
122122
run: pixi run notebook-exec-ci
123123

124+
# Sync the canonical Three.js snapshot into the docs assets so
125+
# MkDocs can serve it (belt-and-braces; docs-build also depends on
126+
# this task).
127+
- name: Sync vendored JS into docs assets
128+
run: pixi run docs-sync-vendored-js
129+
124130
# Build the static files for the documentation site for local inspection
125131
# Input: docs/ directory containing the Markdown files
126132
# Output: site/ directory containing the generated HTML files

β€Ž.github/workflows/tutorial-tests.ymlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ jobs:
4747

4848
- name: Test tutorials as python scripts
4949
shell: bash
50-
run: pixi run script-tests
50+
run: pixi run script-tests-checked
5151

5252
- name: Prepare notebooks
5353
shell: bash
5454
run: pixi run notebook-prepare
5555

5656
- name: Test tutorials as notebooks
5757
shell: bash
58-
run: pixi run notebook-tests
58+
run: pixi run notebook-tests-checked
5959

6060
# Job 2: Build and publish dashboard (reusable workflow)
6161
run-reusable-workflows:

β€Ž.gitignoreβ€Ž

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ build/
1515
# MkDocs
1616
docs/site/
1717

18+
# Generated docs-serving copy of the canonical Three.js (synced from
19+
# src/ by `pixi run docs-sync-vendored-js`; the source of truth is src/)
20+
docs/docs/assets/javascripts/vendor/threejs/
21+
1822
# Jupyter Notebooks
1923
.ipynb_checkpoints
2024

@@ -45,6 +49,10 @@ CMakeLists.txt.user*
4549
*.log
4650
*.zip
4751

52+
# Agents
53+
AGENTS.md
54+
CLAUDE.md
55+
4856
# ED
4957
# Used to fetch tutorials data during their runtime. Need to have '/' at
5058
# the beginning to avoid ignoring 'data' module in the src/.

β€Ž.prettierignoreβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ docs/docs/assets/
2525
# Node
2626
node_modules
2727

28+
# Vendored snapshots
29+
src/easydiffraction/display/structure/renderers/vendor/
30+
src/easydiffraction/report/templates/html/vendor/
31+
src/easydiffraction/report/templates/tex/styles/
32+
src/easydiffraction/utils/_vendored/jupyter_dark_detect/
33+
34+
# Tox
35+
.tox
36+
2837
# Misc
2938
.benchmarks
3039
.cache

β€ŽTHIRD_PARTY_LICENSES.mdβ€Ž

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Third-Party Licenses
2+
3+
This file indexes third-party assets vendored in this repository.
4+
5+
## Report LaTeX Styles
6+
7+
The vendored report LaTeX style files are documented in
8+
`src/easydiffraction/report/templates/tex/styles/LICENSES.md`.
9+
10+
## Report HTML Assets
11+
12+
The vendored report HTML assets are documented in
13+
`src/easydiffraction/report/templates/html/vendor/LICENSES.md`.
14+
15+
## Structure-View Three.js
16+
17+
The vendored Three.js assets for the crysview structure view (MIT) are
18+
documented in
19+
`src/easydiffraction/display/structure/renderers/vendor/threejs/LICENSES.md`.
20+
21+
## Structure-View Element Data
22+
23+
The bundled per-element radii and colour palettes (with per-source
24+
provenance) are documented in
25+
`src/easydiffraction/display/structure/assets/LICENSES.md`.

0 commit comments

Comments
Β (0)