Skip to content

Commit dee35f2

Browse files
authored
Merge pull request #153 from scipp/copier-update-april-2025
Copier update April 2025
2 parents 6b4d262 + 9a80533 commit dee35f2

File tree

7 files changed

+10
-5
lines changed

7 files changed

+10
-5
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 5c4fd02
2+
_commit: d3d4dc7
33
_src_path: gh:scipp/copier_template
44
description: Diffraction data reduction for the European Spallation Source
55
max_python: '3.13'

.github/workflows/docs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ jobs:
6565
- run: tox -e linkcheck
6666
if: ${{ inputs.linkcheck }}
6767
- uses: actions/upload-artifact@v4
68+
id: artifact-upload-step
6869
with:
6970
name: docs_html
7071
path: html/
72+
- run: echo "::notice::https://remote-unzip.deno.dev/${{ github.repository }}/artifacts/${{ steps.artifact-upload-step.outputs.artifact-id }}"
7173

72-
- uses: JamesIves/[email protected].2
74+
- uses: JamesIves/[email protected].3
7375
if: ${{ inputs.publish }}
7476
with:
7577
branch: gh-pages

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
if: github.event_name == 'release' && github.event.action == 'published'
6969
steps:
7070
- uses: actions/download-artifact@v4
71-
- uses: pypa/gh-action-pypi-publish@v1.8.14
71+
- uses: pypa/gh-action-pypi-publish@v1.12.4
7272

7373
upload_conda:
7474
name: Deploy Conda

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ venv
1414
.venv
1515

1616
# Caches
17+
*.DS_Store
1718
.clangd/
1819
*.ipynb_checkpoints
1920
__pycache__/

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
## Get in touch
5757

58-
- If you have questions that are not answered by these documentation pages, ask on [GitHub discussions](https://github.com/scipp/essdiffraction/discussions). Please include a self-contained reproducible example if possible.
58+
- If you have questions that are not answered by these documentation pages, ask on [discussions](https://github.com/scipp/essdiffraction/discussions). Please include a self-contained reproducible example if possible.
5959
- Report bugs (including unclear, missing, or wrong documentation!), suggest features or view the source code [on GitHub](https://github.com/scipp/essdiffraction).
6060

6161
```{toctree}

docs/user-guide/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# User guide
1+
# User Guide
22

33
```{toctree}
44
---

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ description = Update dependencies by running pip-compile-multi
6868
deps =
6969
pip-compile-multi
7070
tomli
71+
# Avoid https://github.com/jazzband/pip-tools/issues/2131
72+
pip==24.2
7173
skip_install = true
7274
changedir = requirements
7375
commands = python ./make_base.py --nightly scipp,scippnexus,sciline,plopp,scippneutron,essreduce,tof

0 commit comments

Comments
 (0)