Skip to content

Release: merge develop into master #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrikjacobsenfys merged 3 commits into from
Jan 27, 2026
Merged

Release: merge develop into master #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fef02f4
Backmerge: v0.1.0 from master into develop [skip ci]
Jan 27, 2026
3c4b181
Add correct default branch to the dashboard (#88)
AndrewSazonov Jan 27, 2026
7263881
Fix the copier-copy task and readme logo paths (#87)
AndrewSazonov Jan 27, 2026
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
View file
Open in desktop
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.0.3
_commit: v0.0.5
_src_path: gh:easyscience/templates
app_docs_url: https://easyscience.github.io/dynamics-app
app_doi: 10.5281/zenodo.18163581
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/dashboard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ jobs:
shell: bash
run: pixi add --pypi --git https://github.com/enhantica/badgery badgery

# Temporary: do not use $DEFAULT_BRANCH in $DEFAULT_BRANCH $DEVELOP_BRANCH $CI_BRANCH
- name: Run docstring coverage and code complexity/maintainability checks
run: |
for BRANCH in $DEVELOP_BRANCH $CI_BRANCH; do
for BRANCH in $DEFAULT_BRANCH $DEVELOP_BRANCH $CI_BRANCH; do
echo
echo "🔹🔸🔹🔸🔹 Processing branch $BRANCH 🔹🔸🔹🔸🔹"
if [ -d "../$BRANCH" ]; then
Expand All @@ -57,10 +56,6 @@ jobs:
pixi run radon raw -s -j $CODE_PATH > reports/$BRANCH/raw-metrics.json
done

# Temporary: copy develop branch code metrics to default branch folder
- name: Copy develop branch reports to default branch folder
run: cp -r reports/$DEVELOP_BRANCH reports/$DEFAULT_BRANCH

- name: Generate dashboard HTML
run: >
pixi run python -m badgery --config .badgery.yaml --repo ${{ github.repository
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<p>
<picture>
<!-- light mode logo -->
<source media='(prefers-color-scheme: light)' srcset='https://raw.githubusercontent.com/easyscience/assets-branding/refs/heads/master/easypeasy/logos/light.svg'>
<source media='(prefers-color-scheme: light)' srcset='https://raw.githubusercontent.com/easyscience/dynamics-lib/refs/heads/master/docs/docs/assets/images/logo_light.svg'>
<!-- dark mode logo -->
<source media='(prefers-color-scheme: dark)' srcset='https://raw.githubusercontent.com/easyscience/assets-branding/refs/heads/master/easypeasy/logos/dark.svg'>
<source media='(prefers-color-scheme: dark)' srcset='https://raw.githubusercontent.com/easyscience/dynamics-lib/refs/heads/master/docs/docs/assets/images/logo_dark.svg'>
<!-- default logo == light mode logo -->
<img src='https://raw.githubusercontent.com/easyscience/assets-branding/refs/heads/master/easypeasy/logos/light.svg' alt='EasyPeasy'>
<img src='https://raw.githubusercontent.com/easyscience/dynamics-lib/refs/heads/master/docs/docs/assets/images/logo_light.svg' alt='EasyDynamics'>
</picture>
</p>

Expand Down
2 changes: 1 addition & 1 deletion pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ docs-set-default-pre = 'mike set-default -F docs/mkdocs.yml --push --branch gh-p
docs-update-assets = 'pixi run python tools/update_docs_assets.py'

# 📦 Template Management Tasks
copier-copy = "pixi run copier copy gh:easyscience/templates-app . --data-file ../dynamics/.copier-answers.yml --data template_type=lib"
copier-copy = "pixi run copier copy gh:easyscience/templates . --data-file ../dynamics/.copier-answers.yml --data template_type=lib"
copier-recopy = "pixi run copier recopy --data-file ../dynamics/.copier-answers.yml --data template_type=lib"
copier-update = "pixi run copier update --data-file ../dynamics/.copier-answers.yml --data template_type=lib"

Expand Down
Loading