Merge pull request #2 from scipp/copier-update

Drop python 3.8 support and update from copier template.
scipp · Nov 28, 2023 · 1628d4f · 1628d4f
2 parents 8fddba8 + dc3b222
commit 1628d4f
Show file tree

Hide file tree

Showing 36 changed files with 197 additions and 257 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,9 +1,9 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 3ad29de
+_commit: ff7f76b
 _src_path: gh:scipp/copier_template
 description: Data reduction for NMX at the European Spallation Source
 max_python: '3.11'
-min_python: '3.8'
+min_python: '3.9'
 namespace_package: ess
 nightly_deps: scipp,sciline,scippnexus,plopp
 orgname: scipp

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   formatting:
     name: Formatting and static analysis
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     outputs:
       min_python: ${{ steps.vars.outputs.min_python }}
       min_tox_env: ${{ steps.vars.outputs.min_tox_env }}
@@ -39,7 +39,7 @@ jobs:
     needs: formatting
     strategy:
       matrix:
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-22.04']
         python:
           - version: '${{needs.formatting.outputs.min_python}}'
             tox-env: '${{needs.formatting.outputs.min_tox_env}}'

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -39,7 +39,7 @@ env:
 jobs:
   docs:
     name: Build documentation
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     steps:
       - run: sudo apt install --yes graphviz pandoc
       - uses: actions/checkout@v3

diff --git a/.github/workflows/nightly_at_main.yml b/.github/workflows/nightly_at_main.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   setup:
     name: Setup variables
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     outputs:
       min_python: ${{ steps.vars.outputs.min_python }}
     steps:
@@ -25,7 +25,7 @@ jobs:
     needs: setup
     strategy:
       matrix:
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-22.04']
         python:
           - version: '${{needs.setup.outputs.min_python}}'
             tox-env: 'nightly'

diff --git a/.github/workflows/nightly_at_release.yml b/.github/workflows/nightly_at_release.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   setup:
     name: Setup variables
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     outputs:
       min_python: ${{ steps.vars.outputs.min_python }}
       release_tag: ${{ steps.release.outputs.release_tag }}
@@ -31,7 +31,7 @@ jobs:
     needs: setup
     strategy:
       matrix:
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-22.04']
         python:
           - version: '${{needs.setup.outputs.min_python}}'
             tox-env: 'nightly'

diff --git a/.github/workflows/python-version-ci b/.github/workflows/python-version-ci
@@ -1 +1 @@
-3.8
+3.9
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ defaults:
 jobs:
   build_conda:
     name: Conda build
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     steps:
       - uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
 
   build_wheels:
     name: Wheels
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
 
     steps:
       - uses: actions/checkout@v3
@@ -64,7 +64,7 @@ jobs:
   upload_pypi:
     name: Deploy PyPI
     needs: [build_wheels, build_conda]
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     environment: release
     permissions:
       id-token: write
@@ -76,7 +76,7 @@ jobs:
   upload_conda:
     name: Deploy Conda
     needs: [build_wheels, build_conda]
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     if: github.event_name == 'release' && github.event.action == 'published'
 
     steps:
@@ -100,7 +100,7 @@ jobs:
   assets:
     name: Upload docs
     needs: docs
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     permissions:
       contents: write  # This is needed so that the action can upload the asset
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
     inputs:
       os-variant:
-        default: 'ubuntu-20.04'
+        default: 'ubuntu-22.04'
         type: string
       python-version:
         type: string
@@ -26,7 +26,7 @@ on:
   workflow_call:
     inputs:
       os-variant:
-        default: 'ubuntu-20.04'
+        default: 'ubuntu-22.04'
         type: string
       python-version:
         type: string

diff --git a/.github/workflows/unpinned.yml b/.github/workflows/unpinned.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   setup:
     name: Setup variables
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-22.04'
     outputs:
       min_python: ${{ steps.vars.outputs.min_python }}
       release_tag: ${{ steps.release.outputs.release_tag }}
@@ -31,7 +31,7 @@ jobs:
     needs: setup
     strategy:
       matrix:
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-22.04']
         python:
           - version: '${{needs.setup.outputs.min_python}}'
             tox-env: 'unpinned'

diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,14 @@
+# Build artifacts
+build
 dist
 html
 .tox
-src/essnmx.egg-info
+*.egg-info
 
 *.sw?
 
+# Caches
 .clangd/
-.idea/
-.vscode/
 *.ipynb_checkpoints
 __pycache__/
 .vs/
@@ -16,3 +17,20 @@ __pycache__/
 .pytest_cache
 .mypy_cache
 docs/generated/
+
+# Editor settings
+.idea/
+.vscode/
+
+# Data files
+*.data
+*.dat
+*.csv
+*.xye
+*.h5
+*.hdf5
+*.hdf
+*.nxs
+*.raw
+*.cif
+*.rcif
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,6 +5,7 @@ repos:
       - id: check-added-large-files
       - id: check-json
         exclude: asv.conf.json
+      - id: check-merge-conflict
       - id: check-toml
       - id: check-yaml
         exclude: conda/meta.yaml

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Anaconda-Server Badge](https://anaconda.org/scipp/essnmx/badges/version.svg)](https://anaconda.org/scipp/essnmx)
 [![License: BSD 3-Clause](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](LICENSE)
 
-# essnmx
+# Essnmx
 
 ## About
 

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -11,8 +11,8 @@ requirements:
     - setuptools
     - setuptools_scm
   run:
+    - python>=3.9
     - dask
-    - python>=3.8
     - python-graphviz
     - plopp
     - sciline>=23.9.1

diff --git a/docs/_static/anaconda-icon.js b/docs/_static/anaconda-icon.js
diff --git a/docs/_static/anaconda-logo.svg b/docs/_static/anaconda-logo.svg
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
diff --git a/docs/_templates/doc_version.html b/docs/_templates/doc_version.html
@@ -1,2 +1,2 @@
 <!-- This will display the version of the docs -->
-Current {{ project }} version: {{ version }} (<a href="https://github.com/scipp/{{ project }}/releases">older versions</a>).
+Current {{ project }} version: {{ version }} (<a href="https://github.com/scipp/{{ project|lower }}/releases">older versions</a>).
diff --git a/docs/about/index.md b/docs/about/index.md
@@ -1,4 +1,4 @@
-# About Essnmx
+# About
 
 ## Development
 

diff --git a/docs/api-reference/index.md b/docs/api-reference/index.md
@@ -3,7 +3,7 @@
 ## Classes
 
 ```{eval-rst}
-.. currentmodule:: essnmx
+.. currentmodule:: ess.nmx
 
 .. autosummary::
    :toctree: ../generated/classes
@@ -26,4 +26,4 @@
    :toctree: ../generated/modules
    :template: module-template.rst
    :recursive:
-```
+```