Merge branch 'main' into henryiii/chore/noxver

Author: eduardo-rodrigues

.github/workflows/ci.yml

@@ -35,14 +35,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.9', '3.11', '3.13', '3.14']
+        python-version: ['3.10', '3.12', '3.14']
         include:
-          - {os: macos-15-intel, python-version: '3.9'}
-          - {os: macos-latest, python-version: '3.13'}
+          - {os: macos-15-intel, python-version: '3.10'}
           - {os: macos-latest, python-version: '3.14'}
-          - {os: windows-latest, python-version: '3.9'}
+          - {os: windows-latest, python-version: '3.11'}
           - {os: windows-latest, python-version: '3.13'}
-          - {os: windows-latest, python-version: '3.14'}
 
     steps:
     - uses: actions/checkout@v6
@@ -56,7 +54,7 @@ jobs:
     - uses: astral-sh/setup-uv@v7
 
     - name: Install package
-      run: uv pip install --system -e .[test]
+      run: uv pip install --system -e. --group=test
 
     - name: Pytest
       if: runner.os == 'Linux'
@@ -92,7 +90,7 @@ jobs:
       run: sudo apt-get install graphviz
 
     - name: Install package
-      run: uv pip install --system -e .[test]
+      run: uv pip install --system -e. --group=test
 
     - name: Install notebook requirements
       run: uv pip install --system nbconvert jupyter_client ipykernel pydot

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
   rev: "v0.14.14"
   hooks:
     - id: ruff-check
-      args: ["--fix", "--show-fixes"]
+      args: ["--fix"]
     - id: ruff-format
 
 - repo: https://github.com/pre-commit/mirrors-mypy

.readthedocs.yml

@@ -13,13 +13,10 @@ sphinx:
 formats: all
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.11"
-
-python:
-  install:
-  - method: pip
-    path: .
-    extra_requirements:
-    - docs
+    python: "3.14"
+  jobs:
+    install:
+    - pip install --upgrade pip
+    - pip install --group docs

README.md

@@ -34,8 +34,9 @@ pip install decaylanguage
 
 You can use a virtual environment through pipenv or with `--user` if you know
 what those are. [Python
-3.9+](http://docs.python-guide.org/en/latest/starting/installation) supported
-(see version 0.14 for Python 3.6 support, 0.18 for Python 3.7 and 3.8 support).
+3.10+](http://docs.python-guide.org/en/latest/starting/installation) supported
+(see version 0.14 for Python 3.6 support, 0.18 for Python 3.7 and 3.8 support,
+0.20 for Python 3.8 support).
 
 <details><summary>Dependencies: (click to expand)</summary><p>
 

notebooks/AmpGen2GooFit D2K3p.ipynb

@@ -269,7 +269,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -287,7 +287,7 @@
     }
    ],
    "source": [
-    "for spintype, c in zip(SpinType, colors):\n",
+    "for spintype, c in zip(SpinType, colors, strict=False):\n",
     "    ps = [\n",
     "        c | format(str(p), \"11\")\n",
     "        for p in GooFitChain.all_particles\n",

noxfile.py

@@ -13,24 +13,22 @@
 
 @nox.session
 def lint(session):
-    session.install("pre-commit")
-    session.run("pre-commit", "run", "--all-files", *session.posargs)
+    session.install("prek")
+    session.run("prek", "run", "--all-files", *session.posargs)
 
 
 @nox.session
 def pylint(session: nox.Session) -> None:
     """
     Run pylint.
     """
-
-    session.install("pylint")
-    session.install("-e.[dev]")
+    session.install("-e.", "--group=dev", "pylint")
     session.run("pylint", "src", *session.posargs)
 
 
 @nox.session(python=PYTHON_VERSIONS)
 def tests(session):
-    session.install(".[test]")
+    session.install(".", "--group=test")
     session.run("pytest", *session.posargs)
 
 

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "hatchling.build"
 name = "decaylanguage"
 description = "A language to describe, manipulate and convert particle decays"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [
     { name = "Eduardo Rodrigues", email = "eduardo.rodrigues@cern.ch" },
     { name = "Henry Schreiner", email = "henryfs@princeton.edu" },
@@ -33,7 +33,6 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -53,9 +52,9 @@ dependencies = [
 ]
 dynamic = ["version"]
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
-    "pytest>=6",
+    { include-group = "test" }
 ]
 docs = [
     "sphinx-rtd-theme>=0.5.0",
@@ -147,6 +146,9 @@ messages_control.disable = [
     "duplicate-code",
 ]
 
+[tool.ruff]
+show-fixes = true
+
 [tool.ruff.lint]
 extend-select = [
   "B",           # flake8-bugbear

src/decaylanguage/dec/dec.py

@@ -42,11 +42,11 @@
 import os
 import re
 import warnings
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from io import StringIO
 from itertools import chain, zip_longest
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 from hepunits import GeV
 from lark import Lark, Token, Transformer, Tree, Visitor
@@ -995,7 +995,7 @@ def _align_items(
 
             aligned.append(row)
 
-        return [sep.join(row) for row in zip(*aligned)]
+        return [sep.join(row) for row in zip(*aligned, strict=True)]
 
     def build_decay_chains(
         self,