Skip to content

Commit 44bc4b8

Browse files
committed
revert benchmark workaround + whatsnew entry
1 parent c88d158 commit 44bc4b8

File tree

5 files changed

+344
-342
lines changed

5 files changed

+344
-342
lines changed

benchmarks/asv.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// * No build-time environment variables.
2424
// * Is run in the same environment as the ASV install itself.
2525
"delegated_env_commands": [
26-
"PY_VER=3.11 nox --envdir={conf_dir}/.asv/env/nox01 --session=tests --install-only --no-error-on-external-run --verbose"
26+
"PY_VER=3.12 nox --envdir={conf_dir}/.asv/env/nox01 --session=tests --install-only --no-error-on-external-run --verbose"
2727
],
2828
// The parent directory of the above environment.
2929
// The most recently modified environment in the directory will be used.

benchmarks/bm_runner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def _check_requirements(package: str) -> None:
6767

6868
def _prep_data_gen_env() -> None:
6969
"""Create or access a separate, unchanging environment for generating test data."""
70-
python_version = "3.11"
70+
python_version = "3.12"
7171
data_gen_var = "DATA_GEN_PYTHON"
7272
if data_gen_var in environ:
7373
echo("Using existing data generation environment.")
@@ -87,7 +87,7 @@ def _prep_data_gen_env() -> None:
8787
# Find the environment built above, set it to be the data generation
8888
# environment.
8989
data_gen_python = next(
90-
(ROOT_DIR / ".nox").rglob("tests*/bin/python3.12")
90+
(ROOT_DIR / ".nox").rglob(f"tests*/bin/python{python_version}")
9191
).resolve()
9292
environ[data_gen_var] = str(data_gen_python)
9393

docs/src/whatsnew/latest.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ This document explains the changes made to Iris for this release
7474
🔗 Dependencies
7575
===============
7676

77-
#. N/A
77+
#. `@bjlittle`_ dropped support for ``py39`` and adopted support for ``py312`` as per
78+
the `NEP-29`_ schedule. (:pull:`5894`)
7879

7980

8081
📚 Documentation
@@ -100,6 +101,7 @@ This document explains the changes made to Iris for this release
100101

101102
#. `@jfrost-mo`_ enabled colour output for pytest on GitHub Actions. (:pull:`5895`)
102103

104+
103105
.. comment
104106
Whatsnew author names (@github name) in alphabetical order. Note that,
105107
core dev names are automatically included by the common_links.inc:
@@ -115,3 +117,4 @@ This document explains the changes made to Iris for this release
115117
.. _NPY002: https://docs.astral.sh/ruff/rules/numpy-legacy-random/
116118
.. _numpydoc validation: https://numpydoc.readthedocs.io/en/latest/validation.html#
117119
.. _Dask version 2024.2.1: https://docs.dask.org/en/stable/changelog.html#v2024-2-1
120+
.. _NEP-29: https://numpy.org/neps/nep-0029-deprecation_policy.html#drop-schedule

requirements/locks/py311-linux-64.lock

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)