Skip to content

Commit 3ee4f02

Browse files
committed
remove pytest plugins
1 parent 8058a01 commit 3ee4f02

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

.github/workflows/packaging_wheels.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,22 @@ jobs:
4444
- { minimal: true, python: cp310 }
4545
- { minimal: true, python: cp311 }
4646
- { minimal: true, python: cp312 }
47+
- { minimal: true, python: cp313 }
4748
- { minimal: true, platform: { arch: universal2 } }
4849
runs-on: ${{ matrix.platform.os }}
4950
env:
51+
### cibuildwheel configuration
52+
#
53+
# This is somewhat brittle, so be careful with changes. Some notes for our future selves (and others):
54+
# - cibw will change its cwd to a temp dir and create a separate venv for testing. It then installs the wheel it
55+
# built into that venv, and run the CIBW_TEST_COMMAND. We have to install all dependencies ourselves, and make
56+
# sure that the pytest config in pyproject.toml is available.
57+
# - CIBW_BEFORE_TEST installs the test dependencies by exporting them into a pylock.toml. At the time of writing,
58+
# `uv sync --no-install-project` had problems correctly resolving dependencies using resolution environments
59+
# across all platforms we build for. This might be solved in newer uv versions.
60+
# - CIBW_TEST_COMMAND specifies pytest conf from pyproject.toml. --confcutdir is needed to prevent pytest from
61+
# traversing the full filesystem, which produces an error on Windows.
62+
# - CIBW_TEST_SKIP we always skip tests for *-macosx_universal2 builds, because we run tests for arm64 and x86_64.
5063
CIBW_TEST_SKIP: ${{ inputs.testsuite == 'none' && '*' || '*-macosx_universal2' }}
5164
CIBW_TEST_SOURCES: tests
5265
CIBW_BEFORE_TEST: >

cmake/compiler_launcher.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ include(CMakeParseArguments)
88
# Function to look for ccache and sccache to speed up builds, if available
99
# ────────────────────────────────────────────
1010
function(setup_compiler_launcher_if_available)
11-
if(NOT DEFINED CMAKE_C_COMPILER_LAUNCHER AND NOT DEFINED
12-
ENV{CMAKE_C_COMPILER_LAUNCHER})
11+
if(NOT DEFINED CMAKE_C_COMPILER_LAUNCHER)
1312
find_program(COMPILER_LAUNCHER NAMES ccache sccache)
1413
if(COMPILER_LAUNCHER)
1514
message(STATUS "Using ${COMPILER_LAUNCHER} as C compiler launcher")
@@ -19,8 +18,7 @@ function(setup_compiler_launcher_if_available)
1918
endif()
2019
endif()
2120

22-
if(NOT DEFINED CMAKE_CXX_COMPILER_LAUNCHER
23-
AND NOT DEFINED ENV{CMAKE_CXX_COMPILER_LAUNCHER})
21+
if(NOT DEFINED CMAKE_CXX_COMPILER_LAUNCHER)
2422
find_program(COMPILER_LAUNCHER NAMES ccache sccache)
2523
if(COMPILER_LAUNCHER)
2624
message(STATUS "Using ${COMPILER_LAUNCHER} as C++ compiler launcher")

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,6 @@ test = [ # dependencies used for running tests
233233
"pytest",
234234
"pytest-reraise",
235235
"pytest-timeout",
236-
"pytest-xdist",
237-
#"pytest-randomly",
238236
"pytest-timestamper",
239237
"mypy",
240238
"coverage",
@@ -305,7 +303,7 @@ dev = [ # tooling like uv will install this automatically when syncing the envir
305303

306304
[tool.pytest.ini_options]
307305
minversion = "6.0"
308-
addopts = "-ra --numprocesses 4 --dist loadfile --verbose"
306+
addopts = "-ra --verbose"
309307
testpaths = ["tests"]
310308
filterwarnings = [
311309
"error",

0 commit comments

Comments
 (0)