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,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 6848c57
_commit: 101e594
_src_path: gh:scipp/copier_template
description: Reflectometry data reduction for the European Spallation Source
max_python: '3.12'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
os-variant: ${{ matrix.os }}
python-version: ${{ matrix.python.version }}
tox-env: ${{ matrix.python.tox-env }}
secrets: inherit

docs:
needs: tests
Expand All @@ -54,3 +55,4 @@ jobs:
publish: false
linkcheck: ${{ contains(matrix.variant.os, 'ubuntu') && github.ref == 'refs/heads/main' }}
branch: ${{ github.head_ref == '' && github.ref_name || github.head_ref }}
secrets: inherit
6 changes: 5 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ jobs:
docs:
name: Build documentation
runs-on: 'ubuntu-22.04'
env:
ESS_PROTECTED_FILESTORE_USERNAME: ${{ secrets.ESS_PROTECTED_FILESTORE_USERNAME }}
ESS_PROTECTED_FILESTORE_PASSWORD: ${{ secrets.ESS_PROTECTED_FILESTORE_PASSWORD }}

steps:
- run: sudo apt install --yes graphviz pandoc
- uses: actions/checkout@v4
Expand All @@ -65,7 +69,7 @@ jobs:
name: docs_html
path: html/

- uses: JamesIves/github-pages-deploy-action@v4.6.1
- uses: JamesIves/github-pages-deploy-action@v4.6.3
if: ${{ inputs.publish }}
with:
branch: gh-pages
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly_at_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ jobs:
os-variant: ${{ matrix.os }}
python-version: ${{ matrix.python.version }}
tox-env: ${{ matrix.python.tox-env }}
secrets: inherit
1 change: 1 addition & 0 deletions .github/workflows/nightly_at_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ jobs:
python-version: ${{ matrix.python.version }}
tox-env: ${{ matrix.python.tox-env }}
checkout_ref: ${{ needs.setup.outputs.release_tag }}
secrets: inherit
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ on:
jobs:
test:
runs-on: ${{ inputs.os-variant }}
env:
ESS_PROTECTED_FILESTORE_USERNAME: ${{ secrets.ESS_PROTECTED_FILESTORE_USERNAME }}
ESS_PROTECTED_FILESTORE_PASSWORD: ${{ secrets.ESS_PROTECTED_FILESTORE_PASSWORD }}

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/unpinned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ jobs:
python-version: ${{ matrix.python.version }}
tox-env: ${{ matrix.python.tox-env }}
checkout_ref: ${{ needs.setup.outputs.release_tag }}
secrets: inherit
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ __pycache__/
.pytest_cache
.mypy_cache
docs/generated/
.ruff_cache

# Editor settings
.idea/
Expand Down
12 changes: 6 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ cyclebane==24.6.0
# via sciline
cycler==0.12.1
# via matplotlib
dask==2024.7.0
dask==2024.7.1
# via -r base.in
decorator==5.1.1
# via ipython
essreduce==24.6.0
essreduce==24.7.1
# via -r base.in
exceptiongroup==1.2.1
exceptiongroup==1.2.2
# via ipython
executing==2.0.1
# via stack-data
Expand Down Expand Up @@ -73,7 +73,7 @@ mpltoolbox==24.5.1
# via scippneutron
networkx==3.3
# via cyclebane
numpy==2.0.0
numpy==2.0.1
# via
# contourpy
# h5py
Expand All @@ -84,7 +84,7 @@ numpy==2.0.0
# scipp
# scippneutron
# scipy
orsopy==1.2.0
orsopy==1.2.1
# via -r base.in
packaging==24.1
# via
Expand All @@ -111,7 +111,7 @@ prompt-toolkit==3.0.47
# via ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
pure-eval==0.2.3
# via stack-data
pygments==2.18.0
# via ipython
Expand Down
4 changes: 2 additions & 2 deletions requirements/basetest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
#
# pip-compile-multi
#
exceptiongroup==1.2.1
exceptiongroup==1.2.2
# via pytest
iniconfig==2.0.0
# via pytest
packaging==24.1
# via pytest
pluggy==1.5.0
# via pytest
pytest==8.2.2
pytest==8.3.1
# via -r basetest.in
tomli==2.0.1
# via pytest
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# pip-compile-multi
#
cachetools==5.3.3
cachetools==5.4.0
# via tox
certifi==2024.7.4
# via requests
Expand Down
8 changes: 4 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ json5==0.9.25
# via jupyterlab-server
jsonpointer==3.0.0
# via jsonschema
jsonschema[format-nongpl]==4.22.0
jsonschema[format-nongpl]==4.23.0
# via
# jupyter-events
# jupyterlab-server
Expand All @@ -59,17 +59,17 @@ jupyter-events==0.10.0
# via jupyter-server
jupyter-lsp==2.2.5
# via jupyterlab
jupyter-server==2.14.1
jupyter-server==2.14.2
# via
# jupyter-lsp
# jupyterlab
# jupyterlab-server
# notebook-shim
jupyter-server-terminals==0.5.3
# via jupyter-server
jupyterlab==4.2.3
jupyterlab==4.2.4
# via -r dev.in
jupyterlab-server==2.27.2
jupyterlab-server==2.27.3
# via jupyterlab
notebook-shim==0.2.4
# via jupyterlab
Expand Down
12 changes: 6 additions & 6 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jinja2==3.1.4
# nbconvert
# nbsphinx
# sphinx
jsonschema==4.22.0
jsonschema==4.23.0
# via nbformat
jsonschema-specifications==2023.12.1
# via jsonschema
Expand Down Expand Up @@ -106,15 +106,15 @@ referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
rpds-py==0.18.1
rpds-py==0.19.0
# via
# jsonschema
# referencing
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
# via beautifulsoup4
sphinx==7.3.7
sphinx==7.4.7
# via
# -r docs.in
# myst-parser
Expand All @@ -123,7 +123,7 @@ sphinx==7.3.7
# sphinx-autodoc-typehints
# sphinx-copybutton
# sphinx-design
sphinx-autodoc-typehints==2.2.2
sphinx-autodoc-typehints==2.2.3
# via -r docs.in
sphinx-copybutton==0.5.2
# via -r docs.in
Expand All @@ -133,11 +133,11 @@ sphinxcontrib-applehelp==1.0.8
# via sphinx
sphinxcontrib-devhelp==1.0.6
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-htmlhelp==2.0.6
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-qthelp==1.0.8
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
Expand Down
3 changes: 2 additions & 1 deletion requirements/make_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ def as_nightly(repo: str) -> str:
version = f"cp{sys.version_info.major}{sys.version_info.minor}"
base = "https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly"
suffix = "manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
return "-".join([base, version, version, suffix])
prefix = "scipp @ "
return prefix + "-".join([base, version, version, suffix])
return f"{repo} @ git+https://github.com/{org}/{repo}@main"


Expand Down
2 changes: 1 addition & 1 deletion requirements/mypy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# pip-compile-multi
#
-r test.txt
mypy==1.10.1
mypy==1.11.0
# via -r mypy.in
mypy-extensions==1.0.0
# via mypy
2 changes: 1 addition & 1 deletion requirements/nightly.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ plopp @ git+https://github.com/scipp/plopp@main
sciline @ git+https://github.com/scipp/sciline@main
scippneutron @ git+https://github.com/scipp/scippneutron@main
scippnexus @ git+https://github.com/scipp/scippnexus@main
https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
12 changes: 6 additions & 6 deletions requirements/nightly.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:0d2767c7e7d393923911be667ad07d7dd7cd5e79
# SHA1:e9966047ff7ccde31021cec89e7c13d1677ca1b4
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -24,11 +24,11 @@ cyclebane==24.6.0
# via sciline
cycler==0.12.1
# via matplotlib
dask==2024.7.0
dask==2024.7.1
# via -r nightly.in
decorator==5.1.1
# via ipython
essreduce==24.6.0
essreduce==24.7.1
# via -r nightly.in
executing==2.0.1
# via stack-data
Expand Down Expand Up @@ -72,7 +72,7 @@ mpltoolbox==24.5.1
# via scippneutron
networkx==3.3
# via cyclebane
numpy==2.0.0
numpy==2.0.1
# via
# contourpy
# h5py
Expand All @@ -83,7 +83,7 @@ numpy==2.0.0
# scipp
# scippneutron
# scipy
orsopy==1.2.0
orsopy==1.2.1
# via -r nightly.in
parso==0.8.4
# via jedi
Expand All @@ -105,7 +105,7 @@ prompt-toolkit==3.0.47
# via ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
pure-eval==0.2.3
# via stack-data
pygments==2.18.0
# via ipython
Expand Down