Merge branch 'main' into 1.0.0_alpha

Author: jcapriot

.ci/azure/setup_env.sh

@@ -4,6 +4,7 @@ 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:]')
 
 if ${is_azure}
 then
@@ -13,8 +14,14 @@ 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
 
 conda env create --file environment_test_with_pyversion.yml
 rm environment_test_with_pyversion.yml

.ci/azure/test.yml

@@ -5,16 +5,21 @@ jobs:
       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'
       linux-Python313:
         image: ubuntu-latest
         python.version: '3.13'
+      linux-Python313t:
+        image: ubuntu-latest
+        python.version: '3.13'
+        python.freethreading: True
+        coverage: True
       osx-Python310:
         image: macOS-latest
         python.version: '3.10'
@@ -27,6 +32,10 @@ jobs:
       osx-Python313:
         image: macOS-latest
         python.version: '3.13'
+      osx-Python313t:
+        image: macOS-latest
+        python.version: '3.13'
+        python.freethreading: True
       win-Python310:
         image: windows-latest
         python.version: '3.10'
@@ -39,6 +48,10 @@ jobs:
       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.8
+
+  # testing
+  - sympy
+  - pytest
+  - pytest-cov
+
+  # Building
+  - pip
+  - meson-python>=0.14.0
+  - meson
+  - ninja
+  - cython>=3.1.0
+  - setuptools_scm

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