Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6501209

Browse filesBrowse files
authored
Merge pull request #27059 from QuLogic/py312-final
ci: Clean up Python 3.12 builds
2 parents 7ea11b7 + 49dd3aa commit 6501209
Copy full SHA for 6501209

File tree

2 files changed

+6
-23
lines changed
Filter options

2 files changed

+6
-23
lines changed

‎.github/workflows/cibuildwheel.yml

Copy file name to clipboardExpand all lines: .github/workflows/cibuildwheel.yml
-14Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,6 @@ jobs:
143143
env:
144144
CIBW_BUILD: "cp312-*"
145145
CIBW_ARCHS: ${{ matrix.cibw_archs }}
146-
# Remove this once NumPy with Python 3.12 wheels is not pre-release.
147-
CIBW_BEFORE_BUILD: >-
148-
pip install "meson-python>=0.13.1" ninja "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" &&
149-
pip install --pre "numpy>=1.25" &&
150-
rm -rf {package}/build
151-
CIBW_BEFORE_BUILD_WINDOWS: >-
152-
pip install delvewheel "meson-python>=0.13.1" ninja "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" &&
153-
pip install --pre "numpy>=1.25" &&
154-
rm -rf {package}/build
155-
CIBW_ENVIRONMENT: PIP_NO_BUILD_ISOLATION=0
156-
# Remove this once contourpy has Python 3.12 wheels.
157-
CIBW_BEFORE_TEST: >-
158-
pip install "meson>=1.2.0" "meson-python>=0.13.1" "ninja" "pybind11>=2.10.4" &&
159-
pip install --pre "numpy>=1.25"
160146

161147
- name: Build wheels for CPython 3.11
162148
uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2

‎.github/workflows/tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/tests.yml
+6-9Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ jobs:
7777
pyside6-ver: '!=6.5.1'
7878
extra-requirements: '-r requirements/testing/extra.txt'
7979
- os: ubuntu-22.04
80-
python-version: '3.12-dev'
80+
python-version: '3.12'
8181
pyside6-ver: '!=6.5.1'
82-
pre: true
8382
- os: macos-latest
8483
python-version: 3.9
8584
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
@@ -196,10 +195,8 @@ jobs:
196195
python -m pip install --upgrade pip setuptools wheel
197196
198197
# Install pre-release versions during our weekly upcoming dependency tests.
199-
# Also install for 3.12 to get working NumPy (remove when 1.26 is released)
200-
if [[ "${{ github.event_name == 'schedule' &&
201-
matrix.name-suffix != '(Minimum Versions)' }}" = "true"
202-
|| "${{ matrix.pre }}" = "true" ]]; then
198+
if [[ "${{ github.event_name }}" == 'schedule'
199+
&& "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
203200
PRE="--pre"
204201
fi
205202
@@ -241,7 +238,7 @@ jobs:
241238
echo 'PyQt5 is available' ||
242239
echo 'PyQt5 is not available'
243240
if [[ "${{ runner.os }}" != 'macOS'
244-
&& "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
241+
&& "${{ matrix.python-version }}" != '3.12' ]]; then
245242
python -mpip install --upgrade pyside2${{ matrix.pyside2-ver }} &&
246243
python -c 'import PySide2.QtCore' &&
247244
echo 'PySide2 is available' ||
@@ -254,14 +251,14 @@ jobs:
254251
echo 'PyQt6 is not available'
255252
fi
256253
if [[ "${{ runner.os }}" != 'macOS'
257-
&& "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
254+
&& "${{ matrix.python-version }}" != '3.12' ]]; then
258255
python -mpip install --upgrade pyside6${{ matrix.pyside6-ver }} &&
259256
python -c 'import PySide6.QtCore' &&
260257
echo 'PySide6 is available' ||
261258
echo 'PySide6 is not available'
262259
fi
263260
264-
if [[ "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
261+
if [[ "${{ matrix.python-version }}" != '3.12' ]]; then
265262
python -mpip install --upgrade \
266263
-f "https://extras.wxpython.org/wxPython4/extras/linux/gtk3/${{ matrix.os }}" \
267264
wxPython &&

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.