Copier update

Author: jl-wynen

.copier-answers.yml

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

.github/workflows/ci.yml

@@ -27,12 +27,13 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version-file: '.github/workflows/python-version-ci'
-      - run: python -m pip install --upgrade pip
-      - run: python -m pip install -r requirements/ci.txt
-      - run: tox -e static
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - uses: pre-commit/[email protected]
         with:
-          commit_message: Apply automatic formatting
+          extra_args: --all-files
+      - uses: pre-commit-ci/[email protected]
+        if: always()
+        with:
+          msg: Apply automatic formatting
 
   tests:
     name: Tests

.gitignore

@@ -37,3 +37,4 @@ docs/generated/
 *.raw
 *.cif
 *.rcif
+*.ort

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2023, Scipp contributors (https://github.com/scipp)
+Copyright (c) 2024, Scipp contributors (https://github.com/scipp)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

docs/conf.py

@@ -10,7 +10,7 @@
 
 # General information about the project.
 project = u'ESSdiffraction'
-copyright = u'2023 Scipp contributors'
+copyright = u'2024 Scipp contributors'
 author = u'Scipp contributors'
 
 html_show_sourcelink = True
@@ -23,12 +23,19 @@
     'sphinx.ext.intersphinx',
     'sphinx.ext.mathjax',
     'sphinx.ext.napoleon',
+    'sphinx.ext.viewcode',
     'sphinx_autodoc_typehints',
     'sphinx_copybutton',
     'sphinx_design',
     'nbsphinx',
     'myst_parser',
 ]
+try:
+    import sciline.sphinxext.domain_types  # noqa: F401
+
+    extensions.append('sciline.sphinxext.domain_types')
+except ModuleNotFoundError:
+    pass
 
 myst_enable_extensions = [
     "amsmath",
@@ -54,6 +61,7 @@
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
     'numpy': ('https://numpy.org/doc/stable/', None),
+    'scipp': ('https://scipp.github.io/', None),
 }
 
 # autodocs includes everything, even irrelevant API internals. autosummary
@@ -73,6 +81,16 @@
 typehints_defaults = 'comma'
 typehints_use_rtype = False
 
+sciline_domain_types_prefix = 'ess.diffraction'
+sciline_domain_types_aliases = {
+    'scipp._scipp.core.DataArray': 'scipp.DataArray',
+    'scipp._scipp.core.Dataset': 'scipp.Dataset',
+    'scipp._scipp.core.DType': 'scipp.DType',
+    'scipp._scipp.core.Unit': 'scipp.Unit',
+    'scipp._scipp.core.Variable': 'scipp.Variable',
+    'scipp.core.data_group.DataGroup': 'scipp.DataGroup',
+}
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 

pyproject.toml

@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Scientific/Engineering",
     "Typing :: Typed",
 ]
@@ -54,6 +55,7 @@ minversion = "7.0"
 addopts = """
 --strict-config
 --strict-markers
+--import-mode=importlib
 -ra
 -v
 """

requirements/make_base.py

@@ -43,7 +43,7 @@ def write_dependencies(dependency_name: str, dependencies: List[str]) -> None:
 with open("../pyproject.toml", "rb") as toml_file:
     pyproject = tomli.load(toml_file)
     dependencies = pyproject["project"].get("dependencies")
-    if not dependencies:
+    if dependencies is None:
         raise RuntimeError("No dependencies found in pyproject.toml")
     dependencies = [dep.strip().strip('"') for dep in dependencies]
 

src/ess/diffraction/__init__.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
+# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
 
 """
 Components for diffraction experiments (powder and single crystal).

tests/package_test.py

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
+# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
 from ess import diffraction as pkg
 
 

tox.ini

@@ -15,8 +15,8 @@ commands = pytest
 [testenv:unpinned]
 description = Test with unpinned dependencies, as a user would install now.
 deps =
+  -r requirements/basetest.txt
   essdiffraction
-  pytest
 commands = pytest
 
 [testenv:docs]