Skip to content

Commit 6f5399a

Browse files
authored
Merge pull request #29793 from meeseeksmachine/auto-backport-of-pr-29770-on-v3.10.1-doc
Backport PR #29770 on branch v3.10.1-doc (MNT: Move test for old ipython behavior to minver tests)
2 parents 7b5e45e + ba036e6 commit 6f5399a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.github/workflows/tests.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,7 @@ jobs:
5959
pyside6-ver: '==6.2.0'
6060
- os: ubuntu-20.04
6161
python-version: '3.10'
62-
# One CI run tests ipython/matplotlib-inline before backend mapping moved to mpl
63-
extra-requirements:
64-
-r requirements/testing/extra.txt
65-
"ipython==7.29.0"
66-
"ipykernel==5.5.6"
67-
"matplotlib-inline<0.1.7"
62+
extra-requirements: '-r requirements/testing/extra.txt'
6863
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
6964
# https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954
7065
# https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html

requirements/testing/minver.txt

+8
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ pillow==8.3.2
1313
pyparsing==2.3.1
1414
pytest==7.0.0
1515
python-dateutil==2.7
16+
17+
# Test ipython/matplotlib-inline before backend mapping moved to mpl.
18+
# This should be tested for a reasonably long transition period,
19+
# but we will eventually remove the test when we no longer support
20+
# ipython/matplotlib-inline versions from before the transition.
21+
ipython==7.29.0
22+
ipykernel==5.5.6
23+
matplotlib-inline<0.1.7

0 commit comments

Comments
 (0)