Merge branch 'upstream' into patch-4

Author: cclauss

.circleci/config.yml

@@ -1,27 +1,23 @@
 version: 2.1
 
-build_and_test: &build_and_test_steps
-  - checkout
-  # pipx is already installed, but `pipx list` is empty
-  - run: python --version ; pip --version ; pipx --version ; pwd ; ls -l
-  - run: pip install pytest -r requirements.txt
-  - run: pip install --editable .
-  - run: pytest
-
-
 jobs:
   pre-commit:
     docker:
       - image: cimg/python:3.14
     steps:
       - checkout
+      # pipx is already installed, but `pipx list` is empty
+      - run: python --version ; pip --version ; pipx --version ; pwd ; ls -l
       - run: pipx run pre-commit run --all-files --show-diff-on-failure
 
   pytest:
     docker:
       - image: cimg/python:3.14
-    steps: *build_and_test_steps
-
+    steps:
+      - checkout
+      - run: pip install pytest -r requirements.txt
+      - run: pip install --editable .
+      - run: pytest
 
 workflows:
   build: