copier update

Author: SimonHeybrock

.copier-answers.yml

@@ -1,13 +1,13 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 6848c57
+_commit: 86a1e5c
 _src_path: gh:scipp/copier_template
 description: Diffraction data reduction for the European Spallation Source
 max_python: '3.12'
 min_python: '3.10'
 namespace_package: ess
-nightly_deps: scipp,scippnexus,sciline,plopp,scippneutron
+nightly_deps: scipp,scippnexus,sciline,plopp,scippneutron,essreduce
 orgname: scipp
 prettyname: ESSdiffraction
 projectname: essdiffraction
-related_projects: Scipp,ScippNexus,ScippNeutron,Sciline,Plopp
+related_projects: Scipp,ScippNexus,ScippNeutron,Sciline,Plopp,ESSreduce
 year: 2024

.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/github-pages-deploy-action@v4.6.1
+      - uses: JamesIves/github-pages-deploy-action@v4.6.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

@@ -41,8 +41,26 @@ on:
         type: string
 
 jobs:
+  package-test:
+    runs-on: ${{ inputs.os-variant }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.checkout_ref }}
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ inputs.python-version }}
+      - run: python -m pip install --upgrade pip
+      - run: python -m pip install .
+      - run: python tests/package_test.py
+        name: Run package tests
+
   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/

docs/conf.py

@@ -169,6 +169,7 @@
         "image_dark": "_static/logo-dark.svg",
     },
     "external_links": [
+        {"name": "ESSreduce", "url": "https://scipp.github.io/essreduce"},
         {"name": "Plopp", "url": "https://scipp.github.io/plopp"},
         {"name": "Sciline", "url": "https://scipp.github.io/sciline"},
         {"name": "Scipp", "url": "https://scipp.github.io"},

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"