Skip to content

Commit 8d780d2

Browse files
authored
Merge pull request #385 from jcapriot/v0.11.1_staging
Staging for 0.11.1
2 parents 93d48ec + 2284652 commit 8d780d2

File tree

8 files changed

+71
-21
lines changed

8 files changed

+71
-21
lines changed

discretize/tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ def check_derivative(
582582
fctn,
583583
x0,
584584
num=7,
585-
plotIt=True,
585+
plotIt=False,
586586
dx=None,
587587
expectedOrder=2,
588588
tolerance=0.85,

docs/_static/versions.json

+8-3
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.0 (stable)",
8-
"version": "v0.11.0",
9-
"url": "https://discretize.simpeg.xyz/en/v0.11.0/",
7+
"name": "0.11.1 (stable)",
8+
"version": "v0.11.1",
9+
"url": "https://discretize.simpeg.xyz/en/v0.11.1/",
1010
"preferred": true
1111
},
12+
{
13+
"name": "0.11.0",
14+
"version": "v0.11.0",
15+
"url": "https://discretize.simpeg.xyz/en/v0.11.0/"
16+
},
1217
{
1318
"name": "0.10.0",
1419
"version": "v0.10.0",

docs/content/installing.rst

+18-11
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ You can download the package manager and use it to install the dependencies abov
2323
conda update conda
2424
conda update anaconda
2525

26+
.. _discretize_dependencies:
27+
2628
Dependencies
2729
============
2830

@@ -61,7 +63,8 @@ systems will require a build.
6163
Installing from Source
6264
----------------------
6365
.. attention::
64-
Install ``discretize`` from the source code only if you need to run the development version. Otherwise it's usually better to install it from ``conda-forge``.
66+
Install ``discretize`` from the source code only if you need to run the development version.
67+
Otherwise it's usually better to install it from ``conda-forge`` or ``pypi``.
6568

6669
As ``discretize`` contains several compiled extensions and is not a pure python pacakge,
6770
installing ``discretize`` from the source code requires a C/C++ compiler capable of
@@ -88,25 +91,29 @@ Editable Installs
8891
If you are an active developer of ``discretize``, and find yourself modifying the code often,
8992
you might want to install it from source, in an editable installation. ``discretize`` uses
9093
``meson-python`` to build the external modules and install the package. As such, there are a few extra
91-
steps to take. First, make sure you have the runtime dependencies installed in your environment (see Dependencies listed above).
92-
Then you must install some packages needed to build ``discretize`` in your environment. You can do so with ``pip``::
94+
steps to take:
95+
96+
1. Make sure you have the runtime dependencies installed in your environment (see :ref:`discretize_dependencies` listed above).
97+
However, you **must** install ``numpy >=2.0`` when *building* ``discretize``.
98+
2. You must also install packages needed to build ``discretize`` into your environment. You can do so with ``pip``::
9399

94-
pip install meson-python meson ninja cython setuptools_scm
100+
pip install meson-python meson ninja cython setuptools_scm
95101

96-
Or with ``conda`` (or ``mamba``)::
102+
Or with ``conda``::
97103

98-
conda install -c conda-forge meson-python meson ninja cython setuptools_scm
104+
conda install -c conda-forge meson-python meson ninja cython setuptools_scm
99105

100-
This will allow you to use the build backend required by `discretize`.
106+
This will allow you to use the build backend required by `discretize`.
101107

102-
Finally, you should then be able to perform an editable install using the source code::
108+
3. Finally, you should then be able to perform an editable install using the source code::
103109

104-
pip install --no-build-isolation --editable .
110+
pip install --no-build-isolation --editable .
105111

106112

107113
This builds and installs the local directory to your active python environment in an
108-
"editable" mode; when source code is changed, you will be able to make use of it immediately. It also builds against the packages installed
109-
in your environment instead of creating and isolated environment to build a wheel for the package.
114+
"editable" mode; when source code is changed, you will be able to make use of it immediately. It also builds against the
115+
packages installed in your environment instead of creating and isolated environment to build a wheel for the package,
116+
which is why we needed to install the build requirements into the environment.
110117

111118
Testing your installation
112119
=========================

docs/release/0.11.1-notes.rst

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
.. currentmodule:: discretize
2+
3+
.. _0.11.1_notes:
4+
5+
===================================
6+
``discretize`` 0.11.1 Release Notes
7+
===================================
8+
9+
November 5, 2024
10+
11+
This is a bugfix release for issues found in the previous release, and adds some warning messages for users.
12+
13+
Updates
14+
=======
15+
16+
Warning Messages
17+
----------------
18+
* Added a warning to the `TreeMesh` informing of incoming future behavoir changes regarding
19+
diagonal balancing. This will default to ``True`` in `discretize` 1.0.
20+
* Added warning messages to test functions using uncontrolled randomized input that appear when run under
21+
`pytest` or `nosetest`, alerting the user to non-repeatable tests.
22+
* Changed the default for ``plotIt`` argument to ``False`` for testing functions.
23+
24+
Fixed Bugs
25+
----------
26+
* `TreeMesh.point2index` now refers to the correction function.
27+
28+
29+
Contributors
30+
============
31+
* @jcapriot
32+
33+
Pull requests
34+
=============
35+
36+
* Outstanding bugfixes. by @jcapriot in `#382 <https://github.com/simpeg/discretize/pull/382>`__.
37+
* Warn for non-repeatable random tests in a testing environment by @jcapriot in `#384 <https://github.com/simpeg/discretize/pull/384>`__.
38+
* Staging for 0.11.1 by @jcapriot in `#385 <https://github.com/simpeg/discretize/pull/385>`__.

docs/release/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Release Notes
44
.. toctree::
55
:maxdepth: 2
66

7+
0.11.1 <0.11.1-notes>
78
0.11.0 <0.11.0-notes>
89
0.10.0 <0.10.0-notes>
910
0.9.0 <0.9.0-notes>

examples/README.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
.. _sphx_glr_examples:
2+
13
Examples
2-
********
4+
********

pyproject.toml

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ requires = [
99
# numpy requirement for wheel builds for distribution on PyPI - building
1010
# against 2.x yields wheels that are also compatible with numpy 1.x at
1111
# runtime.
12-
# Note that building against numpy 1.x works fine too - users and
13-
# redistributors can do this by installing the numpy version they like and
14-
# disabling build isolation.
1512
"numpy>=2.0.0rc1",
1613
]
1714

tests/base/test_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ def test_import_time():
170170
# Capture it
171171
out = subprocess.run(cmd, capture_output=True)
172172

173-
# Currently we check t < 1.0s.
174-
assert float(out.stderr.decode("utf-8")[:-1]) < 1.0
173+
# Currently we check t < 1.25s.
174+
assert float(out.stderr.decode("utf-8")[:-1]) < 1.25
175175

176176

177177
def test_random_test_warning():

0 commit comments

Comments
 (0)