Merge pull request #172 from scipp/copierbump

drop python 3.10, bump copier and tox

Author: MridulS

.copier-answers.yml

@@ -1,9 +1,9 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 3561fcd
+_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/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 ]

.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

conda/meta.yaml

@@ -188,7 +188,7 @@
         },
         {
             "name": "Conda",
-            "url": "https://anaconda.org/scipp/essreflectometry",
+            "url": "https://anaconda.org/conda-forge/essreflectometry",
             "icon": "fa-custom fa-anaconda",
             "type": "fontawesome",
         },
@@ -268,7 +268,8 @@ def do_not_plot(*args, **kwargs):
     r'https?://github\.com/.*?/blob/[a-f0-9]+/.+?#',
     # Linkcheck seems to be denied access by some DOI resolvers.
     # Since DOIs are supposed to be permanent, we don't need to check them.'
-    r'https://doi\.org/',
+    r'https?://doi\.org/',
+    r'https?://dx\.doi\.org/',
 ]
 
 # -- Options for Matplotlib in notebooks ----------------------------------

docs/conf.py

@@ -40,7 +40,7 @@ Alternatively, if you want a different workflow, take a look at ``tox.ini`` or `
 Run the tests using
 
 ```sh
-tox -e py310
+tox -e py311
 ```
 
 (or just `tox` if you want to run all environments).

docs/developer/getting-started.md

@@ -10,7 +10,7 @@ pip install essreflectometry
 ````
 ````{tab-item} conda
 ```sh
-conda install -c conda-forge -c scipp essreflectometry
+conda install -c conda-forge essreflectometry
 ```
 ````
 `````