diff --git a/.copier-answers.yml b/.copier-answers.yml index d675c021..e2acb8ed 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -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' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44266a23..8234bc9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 98aaf568..a5ea2b05 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 @@ -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 diff --git a/.github/workflows/nightly_at_main.yml b/.github/workflows/nightly_at_main.yml index 08fdddd2..c2b9d33a 100644 --- a/.github/workflows/nightly_at_main.yml +++ b/.github/workflows/nightly_at_main.yml @@ -31,3 +31,4 @@ jobs: os-variant: ${{ matrix.os }} python-version: ${{ matrix.python.version }} tox-env: ${{ matrix.python.tox-env }} + secrets: inherit diff --git a/.github/workflows/nightly_at_release.yml b/.github/workflows/nightly_at_release.yml index 373c4546..3faa1c23 100644 --- a/.github/workflows/nightly_at_release.yml +++ b/.github/workflows/nightly_at_release.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f56a069..373ea4a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/.github/workflows/unpinned.yml b/.github/workflows/unpinned.yml index 46a84c1c..3f49f722 100644 --- a/.github/workflows/unpinned.yml +++ b/.github/workflows/unpinned.yml @@ -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 diff --git a/.gitignore b/.gitignore index 0f0541bc..46c5ae85 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ __pycache__/ .pytest_cache .mypy_cache docs/generated/ +.ruff_cache # Editor settings .idea/ diff --git a/requirements/base.txt b/requirements/base.txt index f4b73db0..02e432e7 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/basetest.txt b/requirements/basetest.txt index 4d95d3c9..01f19d18 100644 --- a/requirements/basetest.txt +++ b/requirements/basetest.txt @@ -5,7 +5,7 @@ # # pip-compile-multi # -exceptiongroup==1.2.1 +exceptiongroup==1.2.2 # via pytest iniconfig==2.0.0 # via pytest @@ -13,7 +13,7 @@ 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 diff --git a/requirements/ci.txt b/requirements/ci.txt index 4d81cbd2..4bad3aea 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -5,7 +5,7 @@ # # pip-compile-multi # -cachetools==5.3.3 +cachetools==5.4.0 # via tox certifi==2024.7.4 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index 81f8b11c..f0b20ea1 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -59,7 +59,7 @@ 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 @@ -67,9 +67,9 @@ jupyter-server==2.14.1 # 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 diff --git a/requirements/docs.txt b/requirements/docs.txt index 60cb2825..023c0696 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -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 @@ -106,7 +106,7 @@ referencing==0.35.1 # via # jsonschema # jsonschema-specifications -rpds-py==0.18.1 +rpds-py==0.19.0 # via # jsonschema # referencing @@ -114,7 +114,7 @@ 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 @@ -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 @@ -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 diff --git a/requirements/make_base.py b/requirements/make_base.py index 68a17e84..493ede16 100644 --- a/requirements/make_base.py +++ b/requirements/make_base.py @@ -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" diff --git a/requirements/mypy.txt b/requirements/mypy.txt index 6afffb45..bc5d9654 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -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 diff --git a/requirements/nightly.in b/requirements/nightly.in index cc844931..c4d3f4f1 100644 --- a/requirements/nightly.in +++ b/requirements/nightly.in @@ -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 diff --git a/requirements/nightly.txt b/requirements/nightly.txt index 966bc84a..7d252e1c 100644 --- a/requirements/nightly.txt +++ b/requirements/nightly.txt @@ -1,4 +1,4 @@ -# SHA1:0d2767c7e7d393923911be667ad07d7dd7cd5e79 +# SHA1:e9966047ff7ccde31021cec89e7c13d1677ca1b4 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -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 @@ -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 @@ -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 @@ -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