Skip to content

Commit d08dd68

Browse files
authored
Merge pull request #407 from jcapriot/v0.12.0_staging
V0.12.0 staging
2 parents e6058f1 + ac452b3 commit d08dd68

File tree

8 files changed

+88
-26
lines changed

8 files changed

+88
-26
lines changed

.ci/azure/run_tests.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,19 @@ test_args=""
1010

1111
source activate discretize-test
1212

13-
if ${do_doc}
14-
then
15-
if ${is_azure}
16-
then
13+
if [[ "$is_azure" == "true" ]]; then
14+
if [[ "$do_doc" == "true" ]]; then
1715
.ci/setup_headless_display.sh
1816
fi
1917
fi
20-
if ${do_cov}
21-
then
18+
if [[ "do_cov" == "true" ]]; then
2219
echo "Testing with coverage"
2320
test_args="--cov --cov-config=pyproject.toml $test_args"
2421
fi
2522

2623
pytest -vv $test_args
2724

28-
if ${do_cov}
29-
then
25+
if [[ "do_cov" == "true" ]]; then
3026
coverage xml
3127
fi
3228

.ci/azure/setup_env.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,29 @@ is_azure=$(echo "${TF_BUILD:-false}" | tr '[:upper:]' '[:lower:]')
66
do_doc=$(echo "${DOC_BUILD:-false}" | tr '[:upper:]' '[:lower:]')
77
is_free_threaded=$(echo "${PYTHON_FREETHREADING:-false}" | tr '[:upper:]' '[:lower:]')
88
is_rc=$(echo "${PYTHON_RELEASE_CANDIDATE:-false}" | tr '[:upper:]' '[:lower:]')
9+
is_bare=$(echo "${ENVIRON_BARE:-false}" | tr '[:upper:]' '[:lower:]')
910

10-
if ${is_azure}
11-
then
12-
if ${do_doc}
13-
then
11+
if [[ "$is_azure" == "true" ]]; then
12+
if [[ "$do_doc" == "true" ]]; then
1413
.ci/setup_headless_display.sh
1514
fi
1615
fi
1716

18-
if ${is_free_threaded}
19-
then
17+
if [[ "$is_free_threaded" == "true" || "$is_bare" == "true" ]]; then
2018
cp .ci/environment_test_bare.yml environment_test_with_pyversion.yml
2119
echo " - python-freethreading="$PYTHON_VERSION >> environment_test_with_pyversion.yml
2220
else
2321
cp .ci/environment_test.yml environment_test_with_pyversion.yml
2422
echo " - python="$PYTHON_VERSION >> environment_test_with_pyversion.yml
2523
fi
2624

27-
if ${is_rc}
28-
then
25+
if [[ "$is_rc" == "true" ]]; then
2926
sed -i '/^channels:/a\ - conda-forge/label/python_rc' environment_test_with_pyversion.yml
3027
fi
3128
conda env create --file environment_test_with_pyversion.yml
3229
rm environment_test_with_pyversion.yml
3330

34-
if ${is_azure}
35-
then
31+
if [[ "$is_azure" == "true" ]]; then
3632
source activate discretize-test
3733
pip install pytest-azurepipelines
3834
else

.ci/azure/test.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@ jobs:
1515
linux-Python313t:
1616
image: ubuntu-latest
1717
python.version: '3.13'
18+
environ.bare: True
1819
python.freethreading: True
1920
coverage: True
2021
linux-Python314:
2122
image: ubuntu-latest
23+
environ.bare: True
2224
python.version: '3.14'
23-
python.release_candidate: True
2425
linux-Python314t:
2526
image: ubuntu-latest
2627
python.version: '3.14'
28+
environ.bare: True
2729
python.freethreading: True
28-
python.release_candidate: True
2930
osx-Python311:
3031
image: macOS-latest
3132
python.version: '3.11'
@@ -39,6 +40,15 @@ jobs:
3940
image: macOS-latest
4041
python.version: '3.13'
4142
python.freethreading: True
43+
osx-Python314:
44+
image: macOS-latest
45+
python.version: '3.14'
46+
environ.bare: True
47+
osx-Python314t:
48+
image: macOS-latest
49+
python.version: '3.14'
50+
environ.bare: True
51+
python.freethreading: True
4252
win-Python311:
4353
image: windows-latest
4454
python.version: '3.11'
@@ -51,6 +61,16 @@ jobs:
5161
win-Python313t:
5262
image: windows-latest
5363
python.version: '3.13'
64+
environ.bare: True
65+
python.freethreading: True
66+
win-Python314:
67+
image: windows-latest
68+
environ.bare: True
69+
python.version: '3.14'
70+
win-Python314t:
71+
image: windows-latest
72+
python.version: '3.14'
73+
environ.bare: True
5474
python.freethreading: True
5575
displayName: "${{ variables.image }} ${{ variables.python.version }}"
5676
pool:

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Code:
114114
https://github.com/simpeg/discretize
115115

116116
Tests:
117-
https://travis-ci.org/simpeg/discretize
117+
https://dev.azure.com/simpeg/discretize/_build
118118

119119
Bugs & Issues:
120120
https://github.com/simpeg/discretize/issues

docs/_static/versions.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
"url": "https://discretize.simpeg.xyz/en/main/"
55
},
66
{
7-
"name": "0.11.3 (stable)",
8-
"version": "v0.11.3",
9-
"url": "https://discretize.simpeg.xyz/en/v0.11.3/",
7+
"name": "0.12.0 (stable)",
8+
"version": "v0.12.0",
9+
"url": "https://discretize.simpeg.xyz/en/v0.12.0/",
1010
"preferred": true
1111
},
12+
{
13+
"name": "0.11.3",
14+
"version": "v0.11.3",
15+
"url": "https://discretize.simpeg.xyz/en/v0.11.3/"
16+
},
1217
{
1318
"name": "0.11.2",
1419
"version": "v0.11.2",

docs/release/0.12.0-notes.rst

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
.. currentmodule:: discretize
2+
3+
.. _0.12.0_notes:
4+
5+
===================================
6+
``discretize`` 0.12.0 Release Notes
7+
===================================
8+
9+
October 8, 2025
10+
11+
This minor release contains many bugfixes and updates related to new package builds.
12+
13+
Python versions
14+
---------------
15+
`discretize` has bumped its minimum supported `python` version to 3.11, and is tested against versions 3.11-3.14. Minimum scipy versions
16+
have also been bumped to 1.12. Users on older python versions should continue to use `discretize` 0.11.x.
17+
18+
We have also added support for (and tests against) free-threaded python builds for python 3.13 and later, which should be available through
19+
the normal python distribution channels (pypi, conda-forge).
20+
21+
``TreeMesh`` updates
22+
--------------------
23+
Tree meshes now support a `refine_image` method that allows users to refine a mesh based on an image (2D or 3D numpy array). See
24+
:func:``discretize.TreeMesh.refine_image`` for more details.
25+
26+
``TensorMesh`` updates
27+
----------------------
28+
A new :func:``discretize.TensorMesh.point2index`` method has been added to convert a point location to the corresponding cell index in
29+
a tensor mesh, similar to the existing :func:``discretize.TreeMesh.point2index`` method.
30+
31+
32+
Contributors
33+
============
34+
35+
* @jcapriot
36+
37+
Pull requests
38+
=============
39+
* bump sphinx and pydata-sphinx to more recent versions by @jcapriot in `#402 <https://github.com/simpeg/discretize/pull/402>`__
40+
* Small cleanups to the external TreeMesh code, no functionality changes by @jcapriot in `#400 <https://github.com/simpeg/discretize/pull/400>`__
41+
* Add point2index functionality for `tensor_mesh` by @jcapriot in `#401 <https://github.com/simpeg/discretize/pull/401>`__
42+
* Updates for python free threading by @jcapriot in `#403 <https://github.com/simpeg/discretize/pull/403>`__
43+
* Updates for cibuildwheel by @jcapriot in `#405 <https://github.com/simpeg/discretize/pull/405>`__
44+
* Add functionality to refine a `TreeMesh` using an "image" by @jcapriot in `#406 <https://github.com/simpeg/discretize/pull/406>`__

docs/release/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Release Notes
44
.. toctree::
55
:maxdepth: 2
66

7+
0.12.0 <0.12.0-notes>
78
0.11.3 <0.11.3-notes>
89
0.11.2 <0.11.2-notes>
910
0.11.1 <0.11.1-notes>

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ style = [
8989
"flake8-pyproject==1.2.3",
9090
]
9191
build = [
92-
"meson-python>=0.14.0",
92+
"meson-python>=0.15.0",
9393
"meson",
9494
"ninja",
95-
"numpy>=1.22.4",
95+
"numpy>=2.0.0rc1",
9696
"cython>=3.1.0",
9797
"setuptools_scm",
9898
]

0 commit comments

Comments
 (0)