Skip to content

Commit 3006195

Browse files
authored
Merge branch 'master' into make_addAction_compatible_with_Qt6
2 parents 6d7b3c2 + d44e4cc commit 3006195

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
pyside6-version: '6.4' # Python 3.11 needs 6.4+
5858
- use-conda: 'Yes'
5959
skip-pyqt6: true # No PyQt6 conda packages yet
60-
pyside6-version: '6.4' # Conda only has 6.4+
60+
pyside6-version: '6.4' # Conda only has 6.4+ for Python <3.8
6161
- use-conda: 'No'
6262
pyqt5-version: '5.15' # Test with latest optional packages
6363
- python-version: '3.7'
@@ -67,6 +67,7 @@ jobs:
6767
- python-version: '3.11'
6868
use-conda: 'No'
6969
skip-pyside2: true # Pyside2 wheels don't support Python 3.11+
70+
pyside6-version: '6.5' # Test upper bound
7071
- os: windows-latest
7172
python-version: '3.7'
7273
use-conda: 'Yes'
@@ -84,7 +85,7 @@ jobs:
8485
- os: macos-latest
8586
python-version: '3.7'
8687
use-conda: 'No'
87-
pyqt6-version: 6.4 # Test upper bound
88+
pyqt6-version: 6.5 # Test upper bound
8889
pyside2-version: 5.15 # Test upper bound
8990
steps:
9091
- name: Checkout branch

.github/workflows/test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ fi
5353

5454
# Build wheel of package
5555
git clean -xdf -e *.coverage
56+
python -m pip install --upgrade pip
5657
python -m pip install --upgrade build
5758
python -bb -X dev -W error -m build
5859

5960
# Install package from built wheel
60-
echo dist/*.whl | xargs -I % python -bb -X dev -W error -W "ignore::DeprecationWarning:pip._internal.locations._distutils" -W "ignore::DeprecationWarning:distutils.command.install" -m pip install --upgrade %
61+
echo dist/*.whl | xargs -I % python -bb -X dev -W error -W "ignore::DeprecationWarning:pip._internal.locations._distutils" -W "ignore::DeprecationWarning:distutils.command.install" -W "ignore::DeprecationWarning:pip._internal.metadata.importlib._envs" -m pip install --upgrade %
6162

6263
# Print environment information
6364
mamba list

0 commit comments

Comments
 (0)