diff --git a/.circleci/config.yml b/.circleci/config.yml index fce789feb..eb16ee3de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,4 +98,4 @@ workflows: tags: only: /.*/ build: "*musllinux*" - image: quay.io/pypa/musllinux_1_2_aarch64 + image: quay.io/pypa/musllinux_1_2_aarch64:2025.02.02-1 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 8ba8bff93..534d9b2c8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -22,7 +22,7 @@ jobs: include: - image: manylinux_2_28_x86_64 build: "*manylinux*" - - image: musllinux_1_2_x86_64 + - image: musllinux_1_2_x86_64:2025.02.02-1 build: "*musllinux*" steps: @@ -53,9 +53,13 @@ jobs: # Linux arm64 wheels are built on circleci CIBW_ARCHS_LINUX: auto64 # ppc64le s390x + + - id: image_name_fix + run: | + image=${{ matrix.image }}; echo "fixed_image_name=${image/:/_}" >>${GITHUB_OUTPUT} - uses: actions/upload-artifact@v4 with: - name: artifact-${{ matrix.image }} + name: artifact-${{steps.image_name_fix.outputs.fixed_image_name}} path: ./wheelhouse/*.whl build_sdist: diff --git a/docs/requirements.txt b/docs/requirements.txt index fd3033b91..e9d89216c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -3,4 +3,3 @@ sphinx-rtd-theme==3.0.2 sphinx-autoapi sphinx-autodoc-typehints sphinxcontrib-autoprogram -importlib_resources;python_version<'3.9' diff --git a/pyproject.toml b/pyproject.toml index 047d56ca4..8667e8fbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,6 @@ requires = [ "mypy==1.16.1", # also update mypy-requirements.txt "types-requests", "types-psutil", - "importlib_resources>=1.4;python_version<'3.9'", "ruamel.yaml>=0.16.0,<0.19", "schema-salad>=8.9,<9", "cwl-utils>=0.32", @@ -22,8 +21,6 @@ write_to = "cwltool/_version.py" 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*" -# ^ skip building wheels on PyPy (any version) build-verbosity = 1 environment = { CWLTOOL_USE_MYPYC="1", MYPYPATH="$(pwd)/mypy-stubs" } diff --git a/requirements.txt b/requirements.txt index 8c36ccddb..47fafda8f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ schema-salad>=8.9,<9 prov==1.5.1 mypy-extensions psutil>=5.6.6 -importlib_resources>=1.4;python_version<'3.9' coloredlogs pydot>=1.4.1 argcomplete>=1.12.0 diff --git a/test-requirements.txt b/test-requirements.txt index f9b61511b..7ca4d45be 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ pytest>= 6.2,< 8.5 pytest-xdist>=3.2.0 # for the worksteal scheduler psutil # enhances pytest-xdist to allow "-n logical" pytest-httpserver -pytest-retry;python_version>='3.9' +pytest-retry mock>=2.0.0 pytest-mock>=1.10.0 pytest-cov