Skip to content

Commit

Permalink
revert benchmark workaround + whatsnew entry
Browse files Browse the repository at this point in the history
  • Loading branch information
bjlittle committed Apr 2, 2024
1 parent c88d158 commit 44bc4b8
Show file tree
Hide file tree
Showing 5 changed files with 344 additions and 342 deletions.
2 changes: 1 addition & 1 deletion benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// * No build-time environment variables.
// * Is run in the same environment as the ASV install itself.
"delegated_env_commands": [
"PY_VER=3.11 nox --envdir={conf_dir}/.asv/env/nox01 --session=tests --install-only --no-error-on-external-run --verbose"
"PY_VER=3.12 nox --envdir={conf_dir}/.asv/env/nox01 --session=tests --install-only --no-error-on-external-run --verbose"
],
// The parent directory of the above environment.
// The most recently modified environment in the directory will be used.
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/bm_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _check_requirements(package: str) -> None:

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

Expand Down
5 changes: 4 additions & 1 deletion docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ This document explains the changes made to Iris for this release
🔗 Dependencies
===============

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


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

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


.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
core dev names are automatically included by the common_links.inc:
Expand All @@ -115,3 +117,4 @@ This document explains the changes made to Iris for this release
.. _NPY002: https://docs.astral.sh/ruff/rules/numpy-legacy-random/
.. _numpydoc validation: https://numpydoc.readthedocs.io/en/latest/validation.html#
.. _Dask version 2024.2.1: https://docs.dask.org/en/stable/changelog.html#v2024-2-1
.. _NEP-29: https://numpy.org/neps/nep-0029-deprecation_policy.html#drop-schedule
1 change: 0 additions & 1 deletion requirements/locks/py311-linux-64.lock

This file was deleted.

Loading

0 comments on commit 44bc4b8

Please sign in to comment.