Merge pull request #152 from scipp/update-copier

Update copier

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 91ffffb
+_commit: 101e594
 _src_path: gh:scipp/copier_template
 description: SANS data reduction for the European Spallation Source
 max_python: '3.12'

.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

.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/[email protected].1
+      - uses: JamesIves/[email protected].3
         if: ${{ inputs.publish }}
         with:
           branch: gh-pages

.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

.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

.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

.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

.gitignore

@@ -20,6 +20,7 @@ __pycache__/
 .pytest_cache
 .mypy_cache
 docs/generated/
+.ruff_cache
 
 # Editor settings
 .idea/

conda/meta.yaml

@@ -17,8 +17,10 @@ requirements:
     - setuptools_scm
   run:
     - python>=3.10
+
+  {# Conda does not allow spaces between package name and version, so remove them #}
   {% for package in dependencies %}
-    - {% if package == "graphviz" %}python-graphviz{% else %}{{ package }}{% endif %}
+    - {% if package == "graphviz" %}python-graphviz{% else %}{{ package|replace(" ", "") }}{% endif %}
   {% endfor %}
 
 

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.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
     #   -r base.in
     #   contourpy
@@ -113,7 +113,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

requirements/basetest.txt

@@ -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

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

requirements/dev.txt

@@ -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

requirements/docs.txt

@@ -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

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"
 
 

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

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

requirements/nightly.txt

@@ -1,4 +1,4 @@
-# SHA1:942b2a0d63bab480e4dfe7e345ab2839de386dd8
+# SHA1:77c0a073d6a32270c8a0d43370b38dac56ebcdd5
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -24,7 +24,7 @@ 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
@@ -72,7 +72,7 @@ mpltoolbox==24.5.1
     # via scippneutron
 networkx==3.3
     # via cyclebane
-numpy==2.0.0
+numpy==2.0.1
     # via
     #   -r nightly.in
     #   contourpy
@@ -107,7 +107,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