From 8128aa1849c3aad1ab376055fa914a7601ab4cc5 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 30 Apr 2026 14:53:25 +0100 Subject: [PATCH 1/5] Overinstall mpl release candidate3v11v0rc0 --- noxfile.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/noxfile.py b/noxfile.py index 4d733fa2d4..1d838c7c9c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -108,6 +108,13 @@ def cache_cartopy(session: nox.sessions.Session) -> None: ) +MPL_URL_3V11RC0 = ( + "https://files.pythonhosted.org/packages/b2/d1/" + "6a9ba3c934b6d272c894db9ea80257527be9a962b18d4b98b2323104b86b/" + "matplotlib-3.11.0rc1.tar.gz" +) + + def prepare_venv(session: nox.sessions.Session) -> None: """Create and cache the nox session conda environment. @@ -135,6 +142,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: # populate the environment from the lockfile logger.debug(f"Populating conda env at {venv_dir}") session.conda_install("--file", str(lockfile)) + session.conda_install("--url", MPL_URL_3V11RC0) cache_venv(session) elif venv_changed(session): @@ -144,6 +152,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: session.virtualenv.reuse_existing = False session.virtualenv.create() session.conda_install("--file", str(lockfile)) + session.conda_install("--url", MPL_URL_3V11RC0) session.virtualenv.reuse_existing = _re_orig cache_venv(session) From af9ac66f58e78b8641412cd374cd0e6dc04cceab Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 30 Apr 2026 15:04:13 +0100 Subject: [PATCH 2/5] Force-uncache the nox envs. --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 844f2e00b0..9b1a963862 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -111,7 +111,7 @@ jobs: - name: "nox cache" uses: ./.github/workflows/composite/nox-cache with: - cache_build: 6 + cache_build: 0 env_name: ${{ env.ENV_NAME }} lock_file: ${{ env.LOCK_FILE }} From 14ca0e6c015694b0dd9c234ccf0ce4336b95db09 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 30 Apr 2026 15:09:48 +0100 Subject: [PATCH 3/5] Remove --url from conda command. --- noxfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index 1d838c7c9c..572dbfd120 100644 --- a/noxfile.py +++ b/noxfile.py @@ -142,7 +142,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: # populate the environment from the lockfile logger.debug(f"Populating conda env at {venv_dir}") session.conda_install("--file", str(lockfile)) - session.conda_install("--url", MPL_URL_3V11RC0) + session.conda_install(MPL_URL_3V11RC0) cache_venv(session) elif venv_changed(session): @@ -152,7 +152,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: session.virtualenv.reuse_existing = False session.virtualenv.create() session.conda_install("--file", str(lockfile)) - session.conda_install("--url", MPL_URL_3V11RC0) + session.conda_install(MPL_URL_3V11RC0) session.virtualenv.reuse_existing = _re_orig cache_venv(session) From b54e891d7303495b93df51f00550e1c0bbcd4eaf Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 30 Apr 2026 15:51:10 +0100 Subject: [PATCH 4/5] Replace conda install with pip install. --- .github/workflows/ci-tests.yml | 2 +- noxfile.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 9b1a963862..9bae5085b3 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -111,7 +111,7 @@ jobs: - name: "nox cache" uses: ./.github/workflows/composite/nox-cache with: - cache_build: 0 + cache_build: 1 env_name: ${{ env.ENV_NAME }} lock_file: ${{ env.LOCK_FILE }} diff --git a/noxfile.py b/noxfile.py index 572dbfd120..478a4b8c78 100644 --- a/noxfile.py +++ b/noxfile.py @@ -142,7 +142,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: # populate the environment from the lockfile logger.debug(f"Populating conda env at {venv_dir}") session.conda_install("--file", str(lockfile)) - session.conda_install(MPL_URL_3V11RC0) + session.install(MPL_URL_3V11RC0) cache_venv(session) elif venv_changed(session): @@ -152,7 +152,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: session.virtualenv.reuse_existing = False session.virtualenv.create() session.conda_install("--file", str(lockfile)) - session.conda_install(MPL_URL_3V11RC0) + session.install(MPL_URL_3V11RC0) session.virtualenv.reuse_existing = _re_orig cache_venv(session) From bf7255b0241cc9e4d8497e4f23bf484778605f11 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 28 May 2026 17:04:31 +0100 Subject: [PATCH 5/5] Updates to target mpl v3.11.0rc2 release candidate. --- .github/workflows/ci-tests.yml | 2 +- noxfile.py | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 9bae5085b3..c64488b16a 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -111,7 +111,7 @@ jobs: - name: "nox cache" uses: ./.github/workflows/composite/nox-cache with: - cache_build: 1 + cache_build: 2 env_name: ${{ env.ENV_NAME }} lock_file: ${{ env.LOCK_FILE }} diff --git a/noxfile.py b/noxfile.py index 478a4b8c78..ba66f46e0e 100644 --- a/noxfile.py +++ b/noxfile.py @@ -108,10 +108,14 @@ def cache_cartopy(session: nox.sessions.Session) -> None: ) -MPL_URL_3V11RC0 = ( - "https://files.pythonhosted.org/packages/b2/d1/" - "6a9ba3c934b6d272c894db9ea80257527be9a962b18d4b98b2323104b86b/" - "matplotlib-3.11.0rc1.tar.gz" +MPL_URL_RC = ( + # "https://files.pythonhosted.org/packages/b2/d1/" + # "6a9ba3c934b6d272c894db9ea80257527be9a962b18d4b98b2323104b86b/" + # "matplotlib-3.11.0rc1.tar.gz" + # + "https://files.pythonhosted.org/packages/42/b4/" + "41b4c812df4c89230465b71cc86217923f904349d803abf67119a471e0ad/" + "matplotlib-3.11.0rc2.tar.gz" ) @@ -142,7 +146,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: # populate the environment from the lockfile logger.debug(f"Populating conda env at {venv_dir}") session.conda_install("--file", str(lockfile)) - session.install(MPL_URL_3V11RC0) + session.install(MPL_URL_RC) cache_venv(session) elif venv_changed(session): @@ -152,7 +156,7 @@ def prepare_venv(session: nox.sessions.Session) -> None: session.virtualenv.reuse_existing = False session.virtualenv.create() session.conda_install("--file", str(lockfile)) - session.install(MPL_URL_3V11RC0) + session.install(MPL_URL_RC) session.virtualenv.reuse_existing = _re_orig cache_venv(session)