Skip to content

Commit aabe766

Browse files
committed
Remove pytest-xdist
1 parent 4a7e1a3 commit aabe766

4 files changed

Lines changed: 14 additions & 82 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Test all python/qt combinations
5656
uses: coactions/setup-xvfb@v1
5757
with:
58-
run: bash ./testall.sh
58+
run: bash scripts/test.sh
5959

6060
# combine-coverage:
6161
# needs: tests

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ typing = ["mypy>=1.0"]
4141
dev = [
4242
"pytest>=8.4; python_version>='3.9'",
4343
"coverage>=7.10; python_version>='3.9'",
44-
"pytest-xdist[psutil]>=3.8; python_version>='3.9'",
4544

4645
"pytest==7.4; python_version<'3.9'",
4746
"coverage==7.6.1; python_version<'3.9'",
48-
"pytest-xdist[psutil]==3.3; python_version<'3.9'",
4947
]
5048
# only used in github actions
5149
ci = ["pytest-github-actions-annotate-failures>=0.1.7"]
@@ -65,7 +63,6 @@ venvPath = "."
6563
venv = ".venv"
6664

6765
[tool.pytest.ini_options]
68-
# addopts = "-n auto"
6966
markers = ["raises"]
7067
testpaths = ["tests"]
7168

testall.sh renamed to scripts/test.sh

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@ for PY in "${PYTHON_VERSIONS[@]}"; do
1010
uv venv --clear
1111
uv python install "$PY"
1212
for QT in "${QT_VERSIONS[@]}"; do
13+
if [[ "$QT" == "pyside2" && ("$PY" == "3.11" || "$PY" == "3.12" || "$PY" == "3.13") ]]; then
14+
echo "pyside2 requires python <3.11, skipping"
15+
continue
16+
fi
17+
if [[ "$QT" == "pyside6" || "$QT" == "pyqt6" ]] && [[ "$PY" == "3.8" ]]; then
18+
echo "pyside6 and pyqt6 require python >=3.9, skipping"
19+
continue
20+
fi
21+
if [[ "$QT" == "pyside2" && "$OS_NAME" == "darwin" && "$(uname -m)" == "arm64" ]]; then
22+
echo "pyside2 does not publish arm64 packages, skipping"
23+
continue
24+
fi
1325

14-
# pyside2 requires python <3.11
15-
if [[ "$QT" == "pyside2" && ("$PY" == "3.11" || "$PY" == "3.12" || "$PY" == "3.13") ]]; then continue; fi
16-
# pyside6 and pyqt6 require python >=3.9
17-
if [[ "$QT" == "pyside6" || "$QT" == "pyqt6" ]] && [[ "$PY" == "3.8" ]]; then continue; fi
18-
# pyside2 does not publish arm64 packages
19-
if [[ "$QT" == "pyside2" && "$OS_NAME" == "darwin" && "$(uname -m)" == "arm64" ]]; then continue; fi
20-
21-
uv sync --locked --dev
26+
uv sync --locked --group dev --group ci
2227

2328
if ! uv pip install "$QT"; then
2429
echo "Failed to install $QT for Python $PY, skipping"

uv.lock

Lines changed: 0 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)