From ba036e6bd549c6b0ea8154c612e26f52bbd1d8de Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 21 Mar 2025 19:58:34 +0000 Subject: [PATCH] Backport PR #29770: MNT: Move test for old ipython behavior to minver tests --- .github/workflows/tests.yml | 7 +------ requirements/testing/minver.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 376aaa3e293d..91fe6d982455 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,12 +59,7 @@ jobs: pyside6-ver: '==6.2.0' - os: ubuntu-20.04 python-version: '3.10' - # One CI run tests ipython/matplotlib-inline before backend mapping moved to mpl - extra-requirements: - -r requirements/testing/extra.txt - "ipython==7.29.0" - "ipykernel==5.5.6" - "matplotlib-inline<0.1.7" + extra-requirements: '-r requirements/testing/extra.txt' CFLAGS: "-fno-lto" # Ensure that disabling LTO works. # https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954 # https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html diff --git a/requirements/testing/minver.txt b/requirements/testing/minver.txt index 3932e68eb015..d30ebf08f04b 100644 --- a/requirements/testing/minver.txt +++ b/requirements/testing/minver.txt @@ -13,3 +13,11 @@ pillow==8.3.2 pyparsing==2.3.1 pytest==7.0.0 python-dateutil==2.7 + +# Test ipython/matplotlib-inline before backend mapping moved to mpl. +# This should be tested for a reasonably long transition period, +# but we will eventually remove the test when we no longer support +# ipython/matplotlib-inline versions from before the transition. +ipython==7.29.0 +ipykernel==5.5.6 +matplotlib-inline<0.1.7