Skip to content

Commit

Permalink
binary wheels: only build on main and other optimizations
Browse files Browse the repository at this point in the history
- cibuildwheel: adjust pytest parallel execution
- cicircle: upgrade to ubuntu 24.04
- Stop building for musllinux_1_1
  pypa/manylinux#1629
  > musl libc 1.1 is EOL and Alpine Linux 3.12 also (support ended 2 years ago, May 1st, 2022).
  • Loading branch information
mr-c committed Oct 24, 2024
1 parent e3f6cf7 commit 9828060
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
15 changes: 6 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
type: string

machine:
image: ubuntu-2204:current
resource_class: arm.medium # two vCPUs
image: ubuntu-2404:current
resource_class: arm.medium # 2 vCPUs

environment:
CIBW_ARCHS: "aarch64"
Expand Down Expand Up @@ -84,20 +84,17 @@ workflows:
- arm-wheels:
name: arm-wheels-manylinux_2_28
filters:
branches:
only: main
tags:
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:
branches:
only: main
tags:
only: /.*/
build: "*musllinux*"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
types: [published]
workflow_dispatch: {}
repository_dispatch: {}
pull_request:
push:
branches:
- main
Expand All @@ -23,8 +22,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*"

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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*"
Expand Down

0 comments on commit 9828060

Please sign in to comment.