Merge branch 'main' into numpydoc

.coveragerc

@@ -2,5 +2,5 @@
 branch = True
 omit =
     */tests/*
-    */_version_generated.py
+    */_version.py
     **/__init__.py

.github/workflows/docs.yml

@@ -38,7 +38,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.6
         with:
           # Need to fetch more than the last commit so that setuptools-scm can
           # create the correct version string. If the number of commits since
@@ -124,7 +124,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.6
 
       # Fetch the built docs from the "build" job
       - name: Download HTML documentation artifact
@@ -134,7 +134,7 @@ jobs:
           path: doc/_build/html
 
       - name: Checkout the gh-pages branch in a separate folder
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
         with:
           ref: gh-pages
           # Checkout to this folder instead of the current one

.github/workflows/pypi.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.6
         with:
           # Need to fetch more than the last commit so that setuptools_scm can
           # create the correct version string. If the number of commits since
@@ -91,7 +91,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.6
         with:
           # The GitHub token is preserved by default but this job doesn't need
           # to be able to push to GitHub.

.github/workflows/style.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.6
         with:
           persist-credentials: false
 
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.6
         with:
           persist-credentials: false
 

.github/workflows/test.yml

@@ -31,19 +31,28 @@ jobs:
   # Run tests and upload to codecov
   test:
     name: ${{ matrix.os }} python=${{ matrix.python }} dependencies=${{ matrix.dependencies }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       # Otherwise, the workflow would stop if a single job fails. We want to
       # run all of them to catch failures in different combinations.
       fail-fast: false
       matrix:
-        os: [ubuntu, macos, windows]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         python: ["3.8", "3.12"]
         include:
           - python: "3.8"
             dependencies: oldest
           - python: "3.12"
             dependencies: latest
+          # test on macos-13 (x86) using oldest dependencies and python 3.8
+          - os: macos-13
+            dependencies: oldest
+            python: "3.8"
+        exclude:
+          # don't test on macos-latest (arm64) with oldest dependencies
+          - os: macos-latest
+            python: "3.8"
+
     env:
       REQUIREMENTS: env/requirements-build.txt env/requirements-test.txt
       # Used to tag codecov submissions
@@ -61,7 +70,7 @@ jobs:
 
       # Checks-out your repository under $GITHUB_WORKSPACE
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.6
         with:
           # Need to fetch more than the last commit so that setuptools_scm can
           # create the correct version string. If the number of commits since

.gitignore

@@ -14,7 +14,7 @@ MANIFEST
 dask-worker-space
 build/
 dist/
-boule/_version_generated.py
+boule/_version.py
 doc/_build
 doc/api/generated
 doc/tutorials

Makefile

@@ -47,5 +47,5 @@ clean:
 	find . -name "*.pyc" -exec rm -v {} \;
 	find . -name "*.orig" -exec rm -v {} \;
 	find . -name ".coverage.*" -exec rm -v {} \;
-	rm -rvf build dist MANIFEST *.egg-info __pycache__ .coverage .cache .pytest_cache $(PROJECT)/_version_generated.py
+	rm -rvf build dist MANIFEST *.egg-info __pycache__ .coverage .cache .pytest_cache $(PROJECT)/_version.py
 	rm -rvf $(TESTDIR) dask-worker-space

boule/__init__.py

@@ -30,3 +30,6 @@
 from ._sphere import Sphere
 from ._triaxialellipsoid import TriaxialEllipsoid
 from ._version import __version__
+
+# Append a leading "v" to the generated version by setuptools_scm
+__version__ = f"v{__version__}"

pyproject.toml

@@ -48,7 +48,7 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 version_scheme =  "post-release"
 local_scheme =  "no-local-version"
-write_to =  "boule/_version_generated.py"
+write_to =  "boule/_version.py"
 
 # Make sure isort and Black are compatible
 [tool.isort]