Merge branch 'main' into gui-select-reference

Author: jokasimr

.copier-answers.yml

@@ -1,9 +1,9 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 3f79959
+_commit: 024a41b
 _src_path: gh:scipp/copier_template
 description: Reflectometry data reduction for the European Spallation Source
 max_python: '3.13'
-min_python: '3.10'
+min_python: '3.11'
 namespace_package: ess
 nightly_deps: plopp,sciline,scippneutron,scippnexus,scipp
 orgname: scipp

.github/workflows/nightly_at_main_lower_bound.yml

@@ -0,0 +1,37 @@
+name: Nightly test using lower bound dependencies
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 1 * * 1-5'
+
+jobs:
+  setup:
+    name: Setup variables
+    runs-on: 'ubuntu-24.04'
+    outputs:
+      min_python: ${{ steps.vars.outputs.min_python }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get Python version for other CI jobs
+        id: vars
+        run: echo "min_python=$(< .github/workflows/python-version-ci)" >> "$GITHUB_OUTPUT"
+
+  tests:
+    name: Tests at lower bound
+    needs: setup
+    strategy:
+      matrix:
+        os: ['ubuntu-24.04']
+        python:
+          - version: '${{needs.setup.outputs.min_python}}'
+    runs-on: ${{ matrix.os }}
+    env:
+        ESS_PROTECTED_FILESTORE_USERNAME: ${{ secrets.ESS_PROTECTED_FILESTORE_USERNAME }}
+        ESS_PROTECTED_FILESTORE_PASSWORD: ${{ secrets.ESS_PROTECTED_FILESTORE_PASSWORD }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v6
+        with:
+          python-version: ${{ matrix.python.version }}
+      - run: uv run --extra=test --resolution=lowest-direct pytest

.github/workflows/python-version-ci

@@ -1 +1 @@
-3.10
+3.11

.github/workflows/release.yml

@@ -10,29 +10,6 @@ defaults:
     shell: bash -l {0}  # required for conda env
 
 jobs:
-  build_conda:
-    name: Conda build
-    runs-on: 'ubuntu-24.04'
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0  # history required so setuptools_scm can determine version
-
-      - uses: mamba-org/setup-micromamba@v1
-        with:
-          environment-name: build-env
-          create-args: >-
-            conda-build
-            boa
-      - run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: conda-package-noarch
-          path: conda/package/noarch/*.tar.bz2
-
   build_wheels:
     name: Wheels
     runs-on: 'ubuntu-24.04'
@@ -60,7 +37,7 @@ jobs:
 
   upload_pypi:
     name: Deploy PyPI
-    needs: [build_wheels, build_conda]
+    needs: [build_wheels]
     runs-on: 'ubuntu-24.04'
     environment: release
     permissions:
@@ -70,25 +47,8 @@ jobs:
       - uses: actions/download-artifact@v4
       - uses: pypa/[email protected]
 
-  upload_conda:
-    name: Deploy Conda
-    needs: [build_wheels, build_conda]
-    runs-on: 'ubuntu-24.04'
-    if: github.event_name == 'release' && github.event.action == 'published'
-
-    steps:
-      - uses: actions/download-artifact@v4
-      - uses: mamba-org/setup-micromamba@v1
-        with:
-          environment-name: upload-env
-          # frozen python due to breaking removal of 'imp' in 3.12
-          create-args: >-
-            anaconda-client
-            python=3.11
-      - run: anaconda --token ${{ secrets.ANACONDATOKEN }} upload --user scipp --label main $(ls conda-package-noarch/*.tar.bz2)
-
   docs:
-    needs: [upload_conda, upload_pypi]
+    needs: [upload_pypi]
     uses: ./.github/workflows/docs.yml
     with:
       publish: ${{ github.event_name == 'release' && github.event.action == 'published' }}

.pre-commit-config.yaml

@@ -10,7 +10,6 @@ repos:
       - id: check-merge-conflict
       - id: check-toml
       - id: check-yaml
-        exclude: conda/meta.yaml
       - id: detect-private-key
       - id: trailing-whitespace
         args: [ --markdown-linebreak-ext=md ]
@@ -36,6 +35,8 @@ repos:
       - id: codespell
         additional_dependencies:
           - tomli
+        exclude_types:
+          - svg
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:

.python-version

@@ -1 +1 @@
-3.10
+3.11

README.md

@@ -1,6 +1,6 @@
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
 [![PyPI badge](http://img.shields.io/pypi/v/essreflectometry.svg)](https://pypi.python.org/pypi/essreflectometry)
-[![Anaconda-Server Badge](https://anaconda.org/scipp/essreflectometry/badges/version.svg)](https://anaconda.org/scipp/essreflectometry)
+[![Anaconda-Server Badge](https://anaconda.org/conda-forge/essreflectometry/badges/version.svg)](https://anaconda.org/conda-forge/essreflectometry)
 [![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE)
 
 # ESSreflectometry

bibliography.rst

@@ -0,0 +1,4 @@
+Bibliography
+============
+
+.. bibliography::

conda/meta.yaml

@@ -0,0 +1,4 @@
+Bibliography
+============
+
+.. bibliography::