Merge branch 'main' into refine_image

Author: jcapriot

.ci/azure/setup_env.sh

@@ -4,6 +4,8 @@ set -ex #echo on and exit if any line fails
 # TF_BUILD is set to True on azure pipelines.
 is_azure=$(echo "${TF_BUILD:-false}" | tr '[:upper:]' '[:lower:]')
 do_doc=$(echo "${DOC_BUILD:-false}" | tr '[:upper:]' '[:lower:]')
+is_free_threaded=$(echo "${PYTHON_FREETHREADING:-false}" | tr '[:upper:]' '[:lower:]')
+is_rc=$(echo "${PYTHON_RELEASE_CANDIDATE:-false}" | tr '[:upper:]' '[:lower:]')
 
 if ${is_azure}
 then
@@ -13,9 +15,19 @@ then
   fi
 fi
 
-cp .ci/environment_test.yml environment_test_with_pyversion.yml
-echo "  - python="$PYTHON_VERSION >> environment_test_with_pyversion.yml
+if ${is_free_threaded}
+then
+  cp .ci/environment_test_bare.yml environment_test_with_pyversion.yml
+  echo "  - python-freethreading="$PYTHON_VERSION >> environment_test_with_pyversion.yml
+else
+  cp .ci/environment_test.yml environment_test_with_pyversion.yml
+  echo "  - python="$PYTHON_VERSION >> environment_test_with_pyversion.yml
+fi
 
+if ${is_rc}
+then
+  sed -i '/^channels:/a\  - conda-forge/label/python_rc' environment_test_with_pyversion.yml
+fi
 conda env create --file environment_test_with_pyversion.yml
 rm environment_test_with_pyversion.yml
 

.ci/azure/test.yml

@@ -2,34 +2,56 @@ jobs:
 - job:
   strategy:
     matrix:
-      linux-Python310:
-        image: ubuntu-latest
-        python.version: '3.10'
-        coverage: True
       linux-Python311:
         image: ubuntu-latest
         python.version: '3.11'
+        coverage: True
       linux-Python312:
         image: ubuntu-latest
         python.version: '3.12'
-      osx-Python310:
-        image: macOS-latest
-        python.version: '3.10'
+      linux-Python313:
+        image: ubuntu-latest
+        python.version: '3.13'
+      linux-Python313t:
+        image: ubuntu-latest
+        python.version: '3.13'
+        python.freethreading: True
+        coverage: True
+      linux-Python314:
+        image: ubuntu-latest
+        python.version: '3.14'
+        python.release_candidate: True
+      linux-Python314t:
+        image: ubuntu-latest
+        python.version: '3.14'
+        python.freethreading: True
+        python.release_candidate: True
       osx-Python311:
         image: macOS-latest
         python.version: '3.11'
       osx-Python312:
         image: macOS-latest
         python.version: '3.12'
-      win-Python310:
-        image: windows-latest
-        python.version: '3.10'
+      osx-Python313:
+        image: macOS-latest
+        python.version: '3.13'
+      osx-Python313t:
+        image: macOS-latest
+        python.version: '3.13'
+        python.freethreading: True
       win-Python311:
         image: windows-latest
         python.version: '3.11'
       win-Python312:
         image: windows-latest
         python.version: '3.12'
+      win-Python313:
+        image: windows-latest
+        python.version: '3.13'
+      win-Python313t:
+        image: windows-latest
+        python.version: '3.13'
+        python.freethreading: True
   displayName: "${{ variables.image }} ${{ variables.python.version }}"
   pool:
     vmImage: $(image)

.ci/environment_test.yml

@@ -12,10 +12,10 @@ dependencies:
   - matplotlib
 
   # documentation
-  - sphinx
-  - pydata-sphinx-theme==0.15.4
-  - sphinx-gallery>=0.1.13
-  - numpydoc>=1.5
+  - sphinx==8.1.3
+  - pydata-sphinx-theme==0.16.1
+  - sphinx-gallery==0.19.0
+  - numpydoc==1.9.0
   - jupyter
   - graphviz
   - pillow
@@ -31,5 +31,5 @@ dependencies:
   - meson-python>=0.14.0
   - meson
   - ninja
-  - cython>=0.29.35
+  - cython>=3.1.0
   - setuptools_scm

.ci/environment_test_bare.yml

@@ -0,0 +1,19 @@
+name: discretize-test
+channels:
+  - conda-forge
+dependencies:
+  - numpy>=1.22.4
+  - scipy>=1.12
+
+  # testing
+  - sympy
+  - pytest
+  - pytest-cov
+
+  # Building
+  - pip
+  - meson-python>=0.14.0
+  - meson
+  - ninja
+  - cython>=3.1.0
+  - setuptools_scm

.github/workflows/build_distributions.yml

@@ -8,16 +8,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        # macos-15-intel is an Intel runner, macos-14 is Apple silicon
+        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-14]
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v5
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v3.2.0
 
       - uses: actions/upload-artifact@v4
         with:

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2024 SimPEG Developers
+Copyright (c) 2013-2025 SimPEG Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

discretize/_extensions/interputils_cython.pyx

@@ -1,5 +1,6 @@
 # cython: embedsignature=True, language_level=3
 # cython: linetrace=True
+# cython: freethreading_compatible = True
 import numpy as np
 import cython
 cimport numpy as np

discretize/_extensions/simplex_helpers.pyx

@@ -1,6 +1,7 @@
 # distutils: language=c++
 # cython: embedsignature=True, language_level=3
 # cython: linetrace=True
+# cython: freethreading_compatible = True
 
 from libcpp.pair cimport pair
 from libcpp.unordered_map cimport unordered_map

discretize/_extensions/tree.pxd

@@ -68,9 +68,10 @@ cdef extern from "tree.h":
         inline Node* max_node()
         double operator[](int_t)
 
+    ctypedef int (*eval_func_ptr)(void*, Cell*)
     cdef cppclass PyWrapper:
         PyWrapper()
-        void set(void*, int(*)(void*, Cell*))
+        void set(void*, eval_func_ptr eval)
 
     cdef cppclass Tree:
         int_t n_dim