From e30a19671eb556a980bcb5f1aa5d21975fda8109 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Thu, 24 Oct 2024 15:35:55 +0200 Subject: [PATCH] cibuildwheel: adjust pytest parallel execution cicircle: upgrade the machine size Stop building for musllinux_1_1 > musl libc 1.1 is EOL and Alpine Linux 3.12 also (support ended 2 years ago, May 1st, 2022). https://github.com/pypa/manylinux/issues/1629 --- .circleci/config.yml | 9 +-------- .github/workflows/wheels.yml | 2 -- pyproject.toml | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2127e18be3..436fca57ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: machine: image: ubuntu-2204:current - resource_class: arm.medium # two vCPUs + resource_class: arm.large # 4 vCPUs environment: CIBW_ARCHS: "aarch64" @@ -88,13 +88,6 @@ workflows: only: /.*/ build: "*manylinux*" image: quay.io/pypa/manylinux_2_28_aarch64 - - arm-wheels: - name: arm-wheels-musllinux_1_1 - filters: - tags: - only: /.*/ - build: "*musllinux*" - image: quay.io/pypa/musllinux_1_1_aarch64 - arm-wheels: name: arm-wheels-musllinux_1_2 filters: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9c14eb4e76..69c46321a9 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -23,8 +23,6 @@ jobs: include: - image: manylinux_2_28_x86_64 build: "*manylinux*" - - image: musllinux_1_1_x86_64 - build: "*musllinux*" - image: musllinux_1_2_x86_64 build: "*musllinux*" diff --git a/pyproject.toml b/pyproject.toml index a69720739b..cec96b76b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ build-backend = "setuptools.build_meta" write_to = "cwltool/_version.py" [tool.cibuildwheel] -test-command = "python -m pytest -n 2 --junitxml={project}/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml -k 'not (test_bioconda or test_env_filtering or test_udocker)' --pyargs cwltool" +test-command = "python -m pytest --ignore cwltool/schemas -n logical --dist worksteal --junitxml={project}/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml -k 'not (test_bioconda or test_env_filtering or test_udocker)' --pyargs cwltool" test-requires = "-r test-requirements.txt" test-extras = "deps" skip = "pp*"