|
73 | 73 | pyqt6-ver: '!=6.5.1' |
74 | 74 | # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346 |
75 | 75 | pyside6-ver: '!=6.5.1' |
76 | | - - os: ubuntu-20.04 |
| 76 | + - os: ubuntu-22.04 |
77 | 77 | python-version: '3.11' |
78 | | - # https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954 |
79 | | - pyqt6-ver: '!=6.5.1' |
80 | 78 | # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346 |
81 | 79 | pyside6-ver: '!=6.5.1' |
82 | 80 | extra-requirements: '-r requirements/testing/extra.txt' |
@@ -139,7 +137,9 @@ jobs: |
139 | 137 | texlive-xetex \ |
140 | 138 | ttf-wqy-zenhei |
141 | 139 | if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then |
142 | | - sudo apt install -yy libopengl0 |
| 140 | + sudo apt-get install -yy libopengl0 |
| 141 | + else # ubuntu-22.04 |
| 142 | + sudo apt-get install -yy gir1.2-gtk-4.0 libnotify4 |
143 | 143 | fi |
144 | 144 | ;; |
145 | 145 | macOS) |
@@ -180,10 +180,10 @@ jobs: |
180 | 180 | ~/.cache/matplotlib |
181 | 181 | !~/.cache/matplotlib/tex.cache |
182 | 182 | !~/.cache/matplotlib/test_cache |
183 | | - key: 2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }} |
| 183 | + key: 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }} |
184 | 184 | restore-keys: | |
185 | | - 2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}- |
186 | | - 2-${{ runner.os }}-py${{ matrix.python-version }}-mpl- |
| 185 | + 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}- |
| 186 | + 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl- |
187 | 187 |
|
188 | 188 | - name: Install Python dependencies |
189 | 189 | run: | |
@@ -233,7 +233,7 @@ jobs: |
233 | 233 | echo 'PySide2 is available' || |
234 | 234 | echo 'PySide2 is not available' |
235 | 235 | fi |
236 | | - if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then |
| 236 | + if [[ "${{ runner.os }}" != 'macOS' ]]; then |
237 | 237 | python -mpip install --upgrade pyqt6${{ matrix.pyqt6-ver }} && |
238 | 238 | python -c 'import PyQt6.QtCore' && |
239 | 239 | echo 'PyQt6 is available' || |
|
0 commit comments