Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ jobs:
include:
- os: windows-latest
pyside_ver: ${{ needs.build_src.outputs.rel0 }}
wheel: cp39-win_amd64
wheel: cp310-win_amd64
arch: x86_64
- os: windows-11-arm
pyside_ver: ${{ needs.build_src.outputs.rel0 }}
wheel: cp39-win_arm64
wheel: cp310-win_arm64
arch: arm64
- os: ubuntu-latest
pyside_ver: ${{ needs.build_src.outputs.rel0 }}
wheel: cp39-manylinux_x86_64
wheel: cp310-manylinux_x86_64
arch: x86_64
- os: macos-15-intel
pyside_ver: ${{ needs.build_src.outputs.rel0 }}
wheel: cp39-macosx_x86_64
wheel: cp310-macosx_x86_64
arch: x86_64
- os: macos-latest
pyside_ver: ${{ needs.build_src.outputs.rel0 }}
wheel: cp39-macosx_arm64
wheel: cp310-macosx_arm64
arch: arm64
steps:
- name: Download sdist
Expand Down Expand Up @@ -134,8 +134,9 @@ jobs:
python3 -m pip install "aqtinstall!=3.2.1"
&& python3 -m aqt install-qt mac desktop ${{ env.QT_VERSION }} --outputdir ${{ env.QT_BASE_DIR }} --base http://mirrors.ocf.berkeley.edu/qt/
&& python3 ./scripts/set-qt-constraint.py ${{ matrix.pyside_ver }}
# Installing aqtinstall from Git for https://github.com/miurahr/aqtinstall/pull/1000
CIBW_BEFORE_BUILD_WINDOWS: >
python3 -m pip install "aqtinstall!=3.2.1"
python3 -m pip install git+https://github.com/miurahr/aqtinstall.git
&& python3 -m aqt install-qt ${{ env.QT_PLATFORM }} desktop ${{ env.QT_VERSION }} ${{ env.QT_ARCH }} --outputdir ${{ env.QT_BASE_DIR }} --base http://mirrors.ocf.berkeley.edu/qt/
&& python3 ./scripts/set-qt-constraint.py ${{ matrix.pyside_ver }}
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_34
Expand All @@ -162,7 +163,7 @@ jobs:
include:
- os: ubuntu-24.04-arm
pyside_ver: ${{ needs.build_src.outputs.rel0 }}
wheel: cp39-manylinux_aarch64
wheel: cp310-manylinux_aarch64
arch: aarch64
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -190,7 +191,7 @@ jobs:
- name: Install uv
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v6
with:
python-version: "3.9"
python-version: "3.10"
activate-environment: true
- name: Install Python dependencies
run: uv pip install "aqtinstall!=3.2.1" PySide6 auditwheel
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ if(NOT WIN32)
target_compile_options(qtadvanceddocking-qt6 PRIVATE -Og -fPIC)
target_compile_options(${bindings_library} PRIVATE -Og -fPIC)
endif()
target_compile_definitions(${bindings_library} PRIVATE "-DPy_LIMITED_API=0x03090000")
target_compile_definitions(${bindings_library} PRIVATE "-DPy_LIMITED_API=0x030A0000")

# Adjust the name of generated module.
set_property(TARGET ${bindings_library} PROPERTY PREFIX "")
Expand Down
2 changes: 1 addition & 1 deletion Qt-Advanced-Docking-System
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ You may also build from source. Example build from source on Ubuntu 24.04:
```bash
# Install Qt (for example, using aqtinstall)
pip install aqtinstall
aqt install-qt linux desktop 6.10.2 --outputdir qt
aqt install-qt linux desktop 6.11.0 --outputdir qt

# Build PySide6-QtAds
LD_LIBRARY_PATH=$PWD/qt/6.10.2/gcc_64/lib \
CMAKE_PREFIX_PATH=$PWD/qt/6.10.2/gcc_64/lib/cmake/ \
LD_LIBRARY_PATH=$PWD/qt/6.11.0/gcc_64/lib \
CMAKE_PREFIX_PATH=$PWD/qt/6.11.0/gcc_64/lib/cmake/ \
pip install -v .
```

Expand Down
3 changes: 3 additions & 0 deletions scripts/custom-auditwheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
policies = json.loads(POLICY_JSON_MAP[libc].read_text())
for p in policies:
p['lib_whitelist'].extend([
'libpyside6.abi3.so.6.11',
'libpyside6.abi3.so.6.10',
'libpyside6.abi3.so.6.9',
'libpyside6.abi3.so.6.8',
Expand All @@ -21,6 +22,7 @@
'libpyside6.abi3.so.6.5',
'libpyside6.abi3.so.6.4',
'libpyside6.abi3.so.6.3',
'libshiboken6.abi3.so.6.11',
'libshiboken6.abi3.so.6.10',
'libshiboken6.abi3.so.6.9',
'libshiboken6.abi3.so.6.8',
Expand All @@ -31,6 +33,7 @@
'libshiboken6.abi3.so.6.3',
'libQt6Widgets.so.6',
'libQt6Gui.so.6',
'libpyside6qml.abi3.so.6.11',
'libpyside6qml.abi3.so.6.10',
'libpyside6qml.abi3.so.6.9',
'libpyside6qml.abi3.so.6.8',
Expand Down
Loading