From 6963216e5b1f0261b97058685537dda69bd03b98 Mon Sep 17 00:00:00 2001 From: kratman Date: Wed, 3 Apr 2024 12:22:44 -0400 Subject: [PATCH 01/10] Remove python 3.8 --- .github/workflows/benchmark_on_push.yml | 4 ++-- .github/workflows/periodic_benchmarks.yml | 8 ++++---- .github/workflows/publish_pypi.yml | 4 ++-- .github/workflows/run_benchmarks_over_history.yml | 8 ++++---- .github/workflows/run_periodic_tests.yml | 6 +++--- .github/workflows/test_on_push.yml | 4 ++-- .github/workflows/update_version.yml | 2 +- .../user_guide/installation/install-from-source.rst | 2 +- docs/source/user_guide/installation/windows.rst | 2 +- pybamm/expression_tree/concatenations.py | 2 +- pybamm/expression_tree/functions.py | 3 ++- pybamm/expression_tree/interpolant.py | 2 +- pybamm/expression_tree/operations/unpack_symbols.py | 3 ++- pybamm/expression_tree/symbol.py | 3 ++- pyproject.toml | 7 +------ scripts/install_KLU_Sundials.py | 11 ----------- 16 files changed, 29 insertions(+), 42 deletions(-) diff --git a/.github/workflows/benchmark_on_push.yml b/.github/workflows/benchmark_on_push.yml index 41eeb7d637..2405043b53 100644 --- a/.github/workflows/benchmark_on_push.yml +++ b/.github/workflows/benchmark_on_push.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install Linux system dependencies run: | diff --git a/.github/workflows/periodic_benchmarks.yml b/.github/workflows/periodic_benchmarks.yml index 276724d274..f3daedd3c6 100644 --- a/.github/workflows/periodic_benchmarks.yml +++ b/.github/workflows/periodic_benchmarks.yml @@ -21,10 +21,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install Linux system dependencies run: | @@ -58,10 +58,10 @@ jobs: needs: benchmarks runs-on: ubuntu-latest steps: - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install asv run: pip install asv diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index bbff62201d..d1c960ec43 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Get number of cores on Windows id: get_num_cores @@ -107,7 +107,7 @@ jobs: - uses: actions/setup-python@v5 name: Set up Python with: - python-version: 3.8 + python-version: 3.11 - name: Clone pybind11 repo (no history) run: git clone --depth 1 --branch v2.11.1 https://github.com/pybind/pybind11.git diff --git a/.github/workflows/run_benchmarks_over_history.yml b/.github/workflows/run_benchmarks_over_history.yml index 4f7302a4a5..35318fca1c 100644 --- a/.github/workflows/run_benchmarks_over_history.yml +++ b/.github/workflows/run_benchmarks_over_history.yml @@ -23,10 +23,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install nox and asv run: pip install -U pip nox asv - name: Fetch develop branch @@ -53,10 +53,10 @@ jobs: needs: benchmarks runs-on: ubuntu-latest steps: - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install asv run: pip install asv - name: Checkout pybamm-bench repo diff --git a/.github/workflows/run_periodic_tests.yml b/.github/workflows/run_periodic_tests.yml index 5356d4f8ee..5b3fedd6c8 100644 --- a/.github/workflows/run_periodic_tests.yml +++ b/.github/workflows/run_periodic_tests.yml @@ -45,7 +45,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-12, windows-latest] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] # Include macOS M1 runners include: - os: macos-14 @@ -92,7 +92,7 @@ jobs: if: matrix.os != 'windows-latest' run: python -m nox -s pybamm-requires - - name: Run unit tests for GNU/Linux with Python 3.8, 3.9, 3.10, and 3.12; and for macOS and Windows with all Python versions + - name: Run unit tests for GNU/Linux, macOS, and Windows with all Python versions if: (matrix.os == 'ubuntu-latest' && matrix.python-version != 3.11) || (matrix.os != 'ubuntu-latest') run: python -m nox -s unit @@ -136,7 +136,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test_on_push.yml b/.github/workflows/test_on_push.yml index a9d728c6f8..b5b6ec0de4 100644 --- a/.github/workflows/test_on_push.yml +++ b/.github/workflows/test_on_push.yml @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-12, windows-latest] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] # We check coverage on Ubuntu with Python 3.12, so we skip unit tests for it here exclude: - os: ubuntu-latest @@ -185,7 +185,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-12, windows-latest] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12"] # Include macOS M1 runners include: - os: macos-14 diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index 85f85cebe8..fbf09a75d0 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -44,7 +44,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | diff --git a/docs/source/user_guide/installation/install-from-source.rst b/docs/source/user_guide/installation/install-from-source.rst index edcbdf79aa..827f6c2750 100644 --- a/docs/source/user_guide/installation/install-from-source.rst +++ b/docs/source/user_guide/installation/install-from-source.rst @@ -25,7 +25,7 @@ or download the source archive on the repository's homepage. To install PyBaMM, you will need: -- Python 3 (PyBaMM supports versions 3.8, 3.9, 3.10, 3.11, and 3.12) +- Python 3 (PyBaMM supports versions 3.9, 3.10, 3.11, and 3.12) - The Python headers file for your current Python version. - A BLAS library (for instance `openblas `_). - A C compiler (ex: ``gcc``). diff --git a/docs/source/user_guide/installation/windows.rst b/docs/source/user_guide/installation/windows.rst index d99d1f2eb2..84347d1e47 100644 --- a/docs/source/user_guide/installation/windows.rst +++ b/docs/source/user_guide/installation/windows.rst @@ -6,7 +6,7 @@ Windows Prerequisites ------------- -To use PyBaMM, you must have Python 3.8, 3.9, 3.10, 3.11, or 3.12 installed. +To use PyBaMM, you must have Python 3.9, 3.10, 3.11, or 3.12 installed. To install Python 3 download the installation files from `Python’s website `__. Make sure to diff --git a/pybamm/expression_tree/concatenations.py b/pybamm/expression_tree/concatenations.py index a25ac8e0b3..11e695425f 100644 --- a/pybamm/expression_tree/concatenations.py +++ b/pybamm/expression_tree/concatenations.py @@ -8,7 +8,7 @@ import numpy as np import sympy from scipy.sparse import issparse, vstack -from typing import Sequence +from collections.abc import Sequence import pybamm diff --git a/pybamm/expression_tree/functions.py b/pybamm/expression_tree/functions.py index 7f43f0b7c2..6eb301a24c 100644 --- a/pybamm/expression_tree/functions.py +++ b/pybamm/expression_tree/functions.py @@ -6,7 +6,8 @@ import numpy as np from scipy import special import sympy -from typing import Sequence, Callable +from typing import Callable +from collections.abc import Sequence from typing_extensions import TypeVar import pybamm diff --git a/pybamm/expression_tree/interpolant.py b/pybamm/expression_tree/interpolant.py index 16714f9db3..10881d3084 100644 --- a/pybamm/expression_tree/interpolant.py +++ b/pybamm/expression_tree/interpolant.py @@ -4,7 +4,7 @@ from __future__ import annotations import numpy as np from scipy import interpolate -from typing import Sequence +from collections.abc import Sequence import numbers import pybamm diff --git a/pybamm/expression_tree/operations/unpack_symbols.py b/pybamm/expression_tree/operations/unpack_symbols.py index 1933eada76..97e1d08d98 100644 --- a/pybamm/expression_tree/operations/unpack_symbols.py +++ b/pybamm/expression_tree/operations/unpack_symbols.py @@ -2,7 +2,8 @@ # Helper function to unpack a symbol # from __future__ import annotations -from typing import TYPE_CHECKING, Sequence +from typing import TYPE_CHECKING +from collections.abc import Sequence if TYPE_CHECKING: # pragma: no cover import pybamm diff --git a/pybamm/expression_tree/symbol.py b/pybamm/expression_tree/symbol.py index 466e5b7be6..d50b8a6c89 100644 --- a/pybamm/expression_tree/symbol.py +++ b/pybamm/expression_tree/symbol.py @@ -8,7 +8,8 @@ import sympy from scipy.sparse import csr_matrix, issparse from functools import cached_property -from typing import TYPE_CHECKING, Sequence, cast +from typing import TYPE_CHECKING, cast +from collections.abc import Sequence import pybamm from pybamm.util import import_optional_dependency diff --git a/pyproject.toml b/pyproject.toml index 30ed16a17a..7490c94752 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ license = { file = "LICENSE.txt" } description = "Python Battery Mathematical Modelling" authors = [{name = "The PyBaMM Team", email = "pybamm@pybamm.org"}] maintainers = [{name = "The PyBaMM Team", email = "pybamm@pybamm.org"}] -requires-python = ">=3.8, <3.13" +requires-python = ">=3.9, <3.13" readme = {file = "README.md", content-type = "text/markdown"} classifiers = [ "Development Status :: 5 - Production/Stable", @@ -28,7 +28,6 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -54,7 +53,6 @@ Releases = "https://github.com/pybamm-team/PyBaMM/releases" Changelog = "https://github.com/pybamm-team/PyBaMM/blob/develop/CHANGELOG.md" [project.optional-dependencies] -# For the generation of documentation docs = [ "sphinx>=6", "sphinx_rtd_theme>=0.5", @@ -77,7 +75,6 @@ docs = [ examples = [ "jupyter", ] -# Plotting functionality plot = [ "imageio>=2.3.0", # Note: matplotlib is loaded for debug plots, but to ensure PyBaMM runs @@ -85,7 +82,6 @@ plot = [ # outside of plot() methods. "matplotlib>=3.6.0", ] -# For the Citations class cite = [ "pybtex>=0.24.0", ] @@ -97,7 +93,6 @@ bpx = [ tqdm = [ "tqdm", ] -# Dependencies intended for use by developers dev = [ # For working with pre-commit hooks "pre-commit", diff --git a/scripts/install_KLU_Sundials.py b/scripts/install_KLU_Sundials.py index c30a3cf3e5..6224e40776 100755 --- a/scripts/install_KLU_Sundials.py +++ b/scripts/install_KLU_Sundials.py @@ -1,14 +1,3 @@ -# /// pyproject -# [run] -# requires-python = "">=3.8, <3.13"" -# dependencies = [ -# "cmake", -# ] -# -# [additional-info] -# repository = "https://github.com/pybamm-team/PyBaMM" -# documentation = "https://docs.pybamm.org" -# /// import os import subprocess import tarfile From 2a37f614cff19f7ac9ff3ce1bb1d01568926e6ef Mon Sep 17 00:00:00 2001 From: kratman Date: Wed, 3 Apr 2024 12:33:02 -0400 Subject: [PATCH 02/10] More nox fixes --- noxfile.py | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/noxfile.py b/noxfile.py index 17d466e690..048fd0a660 100644 --- a/noxfile.py +++ b/noxfile.py @@ -61,10 +61,7 @@ def run_coverage(session): """Run the coverage tests and generate an XML report.""" set_environment_variables(PYBAMM_ENV, session=session) session.install("coverage", silent=False) - if sys.version_info < (3, 9): - session.install("-e", ".[all,dev]", silent=False) - else: - session.install("-e", ".[all,dev,jax]", silent=False) + session.install("-e", ".[all,dev,jax]", silent=False) session.run("pytest", "--cov=pybamm", "--cov-report=xml", "tests/unit") @@ -72,10 +69,7 @@ def run_coverage(session): def run_integration(session): """Run the integration tests.""" set_environment_variables(PYBAMM_ENV, session=session) - if sys.version_info < (3, 9): - session.install("-e", ".[all,dev]", silent=False) - else: - session.install("-e", ".[all,dev,jax]", silent=False) + session.install("-e", ".[all,dev,jax]", silent=False) session.run("python", "run-tests.py", "--integration") @@ -90,10 +84,7 @@ def run_doctests(session): def run_unit(session): """Run the unit tests.""" set_environment_variables(PYBAMM_ENV, session=session) - if sys.version_info < (3, 9): - session.install("-e", ".[all,dev]", silent=False) - else: - session.install("-e", ".[all,dev,jax]", silent=False) + session.install("-e", ".[all,dev,jax]", silent=False) session.run("python", "run-tests.py", "--unit") @@ -129,18 +120,7 @@ def set_dev(session): # https://bitbucket.org/pybtex-devs/pybtex/issues/169/replace-pkg_resources-with # is fixed session.run(python, "-m", "pip", "install", "setuptools", external=True) - if sys.version_info < (3, 9): - session.run( - python, - "-m", - "pip", - "install", - "-e", - ".[all,dev]", - external=True, - ) - else: - session.run( + session.run( python, "-m", "pip", @@ -155,10 +135,7 @@ def set_dev(session): def run_tests(session): """Run the unit tests and integration tests sequentially.""" set_environment_variables(PYBAMM_ENV, session=session) - if sys.version_info < (3, 9): - session.install("-e", ".[all,dev]", silent=False) - else: - session.install("-e", ".[all,dev,jax]", silent=False) + session.install("-e", ".[all,dev,jax]", silent=False) session.run("python", "run-tests.py", "--all") From 51770eac2621b9c4e5ea7c95fc046a6b2da24166 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:37:18 +0000 Subject: [PATCH 03/10] style: pre-commit fixes --- noxfile.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/noxfile.py b/noxfile.py index 048fd0a660..c93f3d808d 100644 --- a/noxfile.py +++ b/noxfile.py @@ -121,14 +121,14 @@ def set_dev(session): # is fixed session.run(python, "-m", "pip", "install", "setuptools", external=True) session.run( - python, - "-m", - "pip", - "install", - "-e", - ".[all,dev,jax]", - external=True, - ) + python, + "-m", + "pip", + "install", + "-e", + ".[all,dev,jax]", + external=True, + ) @nox.session(name="tests") From 587de3cf0ae393617072fd1d8a2b6189a96ccb03 Mon Sep 17 00:00:00 2001 From: kratman Date: Wed, 3 Apr 2024 13:51:45 -0400 Subject: [PATCH 04/10] Pre-commit --- noxfile.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/noxfile.py b/noxfile.py index 048fd0a660..c93f3d808d 100644 --- a/noxfile.py +++ b/noxfile.py @@ -121,14 +121,14 @@ def set_dev(session): # is fixed session.run(python, "-m", "pip", "install", "setuptools", external=True) session.run( - python, - "-m", - "pip", - "install", - "-e", - ".[all,dev,jax]", - external=True, - ) + python, + "-m", + "pip", + "install", + "-e", + ".[all,dev,jax]", + external=True, + ) @nox.session(name="tests") From 8e2e4a9d5af957b82ba9d96c68e4447fb73409a3 Mon Sep 17 00:00:00 2001 From: kratman Date: Wed, 3 Apr 2024 14:00:03 -0400 Subject: [PATCH 05/10] Pre-commit fixes --- pybamm/solvers/idaklu_jax.py | 5 ++--- pybamm/type_definitions.py | 11 ++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pybamm/solvers/idaklu_jax.py b/pybamm/solvers/idaklu_jax.py index 9a5315e120..ba1c80c1c4 100644 --- a/pybamm/solvers/idaklu_jax.py +++ b/pybamm/solvers/idaklu_jax.py @@ -5,7 +5,6 @@ import numbers from typing import Union -from typing import List from functools import lru_cache @@ -275,7 +274,7 @@ def jax_value( self, t: np.ndarray = None, inputs: Union[dict, None] = None, - output_variables: Union[List[str], None] = None, + output_variables: Union[list[str], None] = None, ): """Helper function to compute the gradient of a jaxified expression @@ -308,7 +307,7 @@ def jax_grad( self, t: np.ndarray = None, inputs: Union[dict, None] = None, - output_variables: Union[List[str], None] = None, + output_variables: Union[list[str], None] = None, ): """Helper function to compute the gradient of a jaxified expression diff --git a/pybamm/type_definitions.py b/pybamm/type_definitions.py index c3d0a56faa..376189b41a 100644 --- a/pybamm/type_definitions.py +++ b/pybamm/type_definitions.py @@ -1,9 +1,6 @@ -# -# Common type definitions for PyBaMM -# from __future__ import annotations -from typing import Union, List, Dict +from typing import Union from typing_extensions import TypeAlias import numpy as np import pybamm @@ -15,6 +12,6 @@ ChildValue: TypeAlias = Union[float, np.ndarray] ChildSymbol: TypeAlias = Union[float, np.ndarray, pybamm.Symbol] -DomainType: TypeAlias = Union[List[str], str, None] -AuxiliaryDomainType: TypeAlias = Union[Dict[str, str], None] -DomainsType: TypeAlias = Union[Dict[str, Union[List[str], str]], None] +DomainType: TypeAlias = Union[list[str], str, None] +AuxiliaryDomainType: TypeAlias = Union[dict[str, str], None] +DomainsType: TypeAlias = Union[dict[str, Union[list[str], str]], None] From 644886477ee89a4701a22f1912127c7fcb58a4c1 Mon Sep 17 00:00:00 2001 From: kratman Date: Wed, 3 Apr 2024 14:14:32 -0400 Subject: [PATCH 06/10] Changing Jax version --- pybamm/util.py | 2 +- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pybamm/util.py b/pybamm/util.py index d5cc7476c9..c3d7b4e263 100644 --- a/pybamm/util.py +++ b/pybamm/util.py @@ -22,7 +22,7 @@ import pybamm # Versions of jax and jaxlib compatible with PyBaMM. Note: these are also defined in -# in the extras dependencies in pyproject.toml, and therefore must be kept in sync. +# the extras dependencies in pyproject.toml, and therefore must be kept in sync. JAX_VERSION = "0.4" JAXLIB_VERSION = "0.4" diff --git a/pyproject.toml b/pyproject.toml index 30ed16a17a..642a50ad0d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -118,8 +118,8 @@ dev = [ ] # For the Jax solver. Note: these must be kept in sync with the versions defined in pybamm/util.py. jax = [ - "jax==0.4.20; python_version >= '3.9'", - "jaxlib==0.4.20; python_version >= '3.9'", + "jax==0.4.25; python_version >= '3.9'", + "jaxlib==0.4.25; python_version >= '3.9'", ] # Contains all optional dependencies, except for jax and dev dependencies all = [ From b0cbfc50460b3a84f764aa3a1e7786c2a34dfad7 Mon Sep 17 00:00:00 2001 From: kratman Date: Wed, 3 Apr 2024 14:43:28 -0400 Subject: [PATCH 07/10] Temporary fix --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 642a50ad0d..07b2909983 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ classifiers = [ ] dependencies = [ "numpy>=1.23.5", - "scipy>=1.9.3", + "scipy>=1.9.3,<1.13.0", "casadi>=3.6.3", "xarray>=2022.6.0", "anytree>=2.8.0", @@ -118,8 +118,8 @@ dev = [ ] # For the Jax solver. Note: these must be kept in sync with the versions defined in pybamm/util.py. jax = [ - "jax==0.4.25; python_version >= '3.9'", - "jaxlib==0.4.25; python_version >= '3.9'", + "jax==0.4.20; python_version >= '3.9'", + "jaxlib==0.4.20; python_version >= '3.9'", ] # Contains all optional dependencies, except for jax and dev dependencies all = [ From 22dcc9243bd511d0d0535b78e0df0d83471da509 Mon Sep 17 00:00:00 2001 From: kratman Date: Wed, 3 Apr 2024 16:08:02 -0400 Subject: [PATCH 08/10] Remove notes --- docs/source/user_guide/installation/gnu-linux-mac.rst | 4 ---- docs/source/user_guide/installation/windows.rst | 4 ---- 2 files changed, 8 deletions(-) diff --git a/docs/source/user_guide/installation/gnu-linux-mac.rst b/docs/source/user_guide/installation/gnu-linux-mac.rst index 46f3d1281f..0be4b98e4c 100644 --- a/docs/source/user_guide/installation/gnu-linux-mac.rst +++ b/docs/source/user_guide/installation/gnu-linux-mac.rst @@ -95,10 +95,6 @@ Optional - JaxSolver Users can install ``jax`` and ``jaxlib`` to use the Jax solver. -.. note:: - - The Jax solver is only supported for Python versions 3.9 through 3.12. - .. code:: bash pip install "pybamm[jax]" diff --git a/docs/source/user_guide/installation/windows.rst b/docs/source/user_guide/installation/windows.rst index 84347d1e47..02d9f8dd29 100644 --- a/docs/source/user_guide/installation/windows.rst +++ b/docs/source/user_guide/installation/windows.rst @@ -71,10 +71,6 @@ Optional - JaxSolver Users can install ``jax`` and ``jaxlib`` to use the Jax solver. -.. note:: - - The Jax solver is only supported for Python versions 3.9 through 3.12. - .. code:: bash pip install "pybamm[jax]" From a2cbb77f01fa75a40b6b9b89b371258073d41006 Mon Sep 17 00:00:00 2001 From: "Eric G. Kratz" Date: Wed, 3 Apr 2024 16:56:15 -0400 Subject: [PATCH 09/10] Apply suggestions from code review Co-authored-by: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> --- .github/workflows/benchmark_on_push.yml | 4 ++-- .github/workflows/periodic_benchmarks.yml | 8 ++++---- .github/workflows/run_benchmarks_over_history.yml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/benchmark_on_push.yml b/.github/workflows/benchmark_on_push.yml index 2405043b53..b0da71461e 100644 --- a/.github/workflows/benchmark_on_push.yml +++ b/.github/workflows/benchmark_on_push.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install Linux system dependencies run: | diff --git a/.github/workflows/periodic_benchmarks.yml b/.github/workflows/periodic_benchmarks.yml index f3daedd3c6..dd5cc39173 100644 --- a/.github/workflows/periodic_benchmarks.yml +++ b/.github/workflows/periodic_benchmarks.yml @@ -21,10 +21,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install Linux system dependencies run: | @@ -58,10 +58,10 @@ jobs: needs: benchmarks runs-on: ubuntu-latest steps: - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install asv run: pip install asv diff --git a/.github/workflows/run_benchmarks_over_history.yml b/.github/workflows/run_benchmarks_over_history.yml index 35318fca1c..c8d6892e66 100644 --- a/.github/workflows/run_benchmarks_over_history.yml +++ b/.github/workflows/run_benchmarks_over_history.yml @@ -23,10 +23,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install nox and asv run: pip install -U pip nox asv - name: Fetch develop branch @@ -53,10 +53,10 @@ jobs: needs: benchmarks runs-on: ubuntu-latest steps: - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install asv run: pip install asv - name: Checkout pybamm-bench repo From ed8848199c54732bd2e40e7e6b7315c9018c8f7c Mon Sep 17 00:00:00 2001 From: "Eric G. Kratz" Date: Wed, 3 Apr 2024 16:58:00 -0400 Subject: [PATCH 10/10] Update .github/workflows/update_version.yml --- .github/workflows/update_version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index fbf09a75d0..eb62469778 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -44,7 +44,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install dependencies run: |