Copier update

Author: jl-wynen

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 86a1e5c
+_commit: 75b9a8f
 _src_path: gh:scipp/copier_template
 description: Diffraction data reduction for the European Spallation Source
 max_python: '3.12'

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: pre-commit/[email protected]
         with:
           extra_args: --all-files
-      - uses: pre-commit-ci/[email protected].2
+      - uses: pre-commit-ci/[email protected].3
         if: always()
         with:
           msg: Apply automatic formatting

.github/workflows/docs.yml

@@ -69,7 +69,7 @@ jobs:
           name: docs_html
           path: html/
 
-      - uses: JamesIves/[email protected].3
+      - uses: JamesIves/[email protected].4
         if: ${{ inputs.publish }}
         with:
           branch: gh-pages

.gitignore

@@ -4,11 +4,13 @@ dist
 html
 .tox
 *.egg-info
+uv.lock  # we lock dependencies with pip-compile, not uv
 
 *.sw?
 
 # Environments
 venv
+.venv
 
 # Caches
 .clangd/
@@ -39,3 +41,4 @@ docs/generated/
 *.cif
 *.rcif
 *.ort
+*.zip

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-json
@@ -14,22 +14,22 @@ repos:
         args: [ --markdown-linebreak-ext=md ]
         exclude: '\.svg'
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.6.0
+    rev: 0.7.1
     hooks:
       - id: nbstripout
         types: [ "jupyter" ]
         args: [ "--drop-empty-cells",
                 "--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.3
+    rev: v0.6.2
     hooks:
       - id: ruff
         args: [ --fix ]
         types_or: [ python, pyi, jupyter ]
       - id: ruff-format
         types_or: [ python, pyi ]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         additional_dependencies:

.python-version

@@ -0,0 +1 @@
+3.10

conda/meta.yaml

@@ -9,6 +9,7 @@ source:
 
 {% set pyproject = load_file_data('pyproject.toml') %}
 {% set dependencies = pyproject.get('project', {}).get('dependencies', {}) %}
+{% set test_dependencies = pyproject.get('project', {}).get('optional-dependencies', {}).get('test', {}) %}
 
 
 requirements:
@@ -28,7 +29,13 @@ test:
   imports:
     - ess.diffraction
   requires:
-    - pytest
+
+  {# Conda does not allow spaces between package name and version, so remove them #}
+  {% for package in test_dependencies %}
+    - {% if package == "graphviz" %}python-graphviz{% else %}{{ package|replace(" ", "") }}{% endif %}
+  {% endfor %}
+
+
   source_files:
     - pyproject.toml
     - tests/

docs/conf.py

@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
+
 import doctest
 import os
 import sys

pyproject.toml

@@ -44,6 +44,13 @@ dependencies = [
 
 dynamic = ["version"]
 
+[project.optional-dependencies]
+test = [
+    "pandas",
+    "pooch",
+    "pytest",
+]
+
 [project.urls]
 "Bug Tracker" = "https://github.com/scipp/essdiffraction/issues"
 "Documentation" = "https://scipp.github.io/essdiffraction"
@@ -83,7 +90,7 @@ ignore = [
     # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
     "COM812", "COM819", "D206", "D300", "E111", "E114", "E117", "ISC001", "ISC002", "Q000", "Q001", "Q002", "Q003", "W191",
 ]
-fixable = ["I001", "B010"]
+fixable = ["B010", "I001", "PT001"]
 isort.known-first-party = ["ess.diffraction", "ess.dream", "ess.powder"]
 pydocstyle.convention = "numpy"
 
@@ -115,3 +122,11 @@ enable_error_code = [
     "truthy-bool",
 ]
 warn_unreachable = true
+
+[tool.codespell]
+ignore-words-list = [
+    # Codespell wants "socioeconomic" which seems to be the standard spelling.
+    # But we use the word in our code of conduct which is the contributor covenant.
+    # Let's not modify it if we don't have to.
+    "socio-economic",
+]

requirements/basetest.in

@@ -1,7 +1,9 @@
 # Dependencies that are only used by tests.
 # Do not make an environment from this file, use test.txt instead!
+# Add more dependencies in the ``test`` list
+# under ``[project.optional-dependencies]`` section, in ``pyproject.toml``
 
-numpy
-pandas
-pooch
-pytest
+# Anything above "--- END OF CUSTOM SECTION ---"
+# will not be touched by ``make_base.py``
+# --- END OF CUSTOM SECTION ---
+# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!