Skip to content

Commit

Permalink
Add manylinux_2_28 tag, prevent cp312-cp312 from running on older ver…
Browse files Browse the repository at this point in the history
…sions

Also drop some already abandoned arches from tox
  • Loading branch information
Qalthos committed Nov 8, 2023
1 parent a9d4823 commit b43a403
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@ jobs:
manylinux-year-target:
- 2014
- _2_24
- _2_28
manylinux-image-target:
# NOTE: Keep in sync with `build-manylinux-container-images.yml`.
# NOTE: Ordered from "heavy" to "fast".
Expand Down Expand Up @@ -828,6 +829,12 @@ jobs:
arch: x86_64
qemu_arch: amd64
manylinux-year-target: 1
exclude:
# NOTE: cp312-cp312 unavailable before _2_28
- manylinux-python-target: cp312-cp312
manylinux-year-target: 2014
- manylinux-python-target: cp312-cp312
manylinux-year-target: _2_24

env:
ANSIBLE_PYLIBSSH_TRACING: >-
Expand Down Expand Up @@ -988,13 +995,20 @@ jobs:
manylinux-year-target:
- 2014
- _2_24
- _2_28
manylinux-image-target:
# NOTE: Keep in sync with `build-manylinux-container-images.yml`.
# NOTE: Ordered from "heavy" to "fast".
- arch: aarch64
qemu_arch: arm64
- arch: s390x
- arch: ppc64le
exclude:
# NOTE: cp312-cp312 unavailable before _2_28
- manylinux-python-target: cp312-cp312
manylinux-year-target: 2014
- manylinux-python-target: cp312-cp312
manylinux-year-target: _2_24

env:
ANSIBLE_PYLIBSSH_TRACING: >-
Expand Down
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ description =
Verify that dists under the dist/ dir have valid metadata
depends =
build-dists
build-dists-manylinux{1,2010,2014,_2_24}-{x86_64,i686,aarch64,armv7l,ppc64,ppc64le,s390x}
build-dists-manylinux{1,2010,2014,_2_24,_2_28}-{x86_64,aarch64,ppc64le,s390x}
build-wheels-pip
delocate-macos-wheels
deps =
Expand All @@ -250,7 +250,7 @@ commands =
twine check --strict {env:PEP517_OUT_DIR}/*


[testenv:build-dists-manylinux{1,2010,2014,_2_24}-{x86_64,i686,aarch64,armv7l,ppc64,ppc64le,s390x}]
[testenv:build-dists-manylinux{1,2010,2014,_2_24,_2_28}-{x86_64,aarch64,ppc64le,s390x}]
allowlist_externals =
{env:DOCKER_EXECUTABLE:docker}
basepython = python3
Expand Down Expand Up @@ -278,17 +278,15 @@ setenv =
{[testenv]setenv}

x86_64: MANYLINUX_ARCH_TAG = x86_64
i686: MANYLINUX_ARCH_TAG = i686
aarch64: MANYLINUX_ARCH_TAG = aarch64
armv7l: MANYLINUX_ARCH_TAG = armv7l
ppc64: MANYLINUX_ARCH_TAG = ppc64
ppc64le: MANYLINUX_ARCH_TAG = ppc64le
s390x: MANYLINUX_ARCH_TAG = s390x

manylinux1: MANYLINUX_VERSION_TAG = 1
manylinux2010: MANYLINUX_VERSION_TAG = 2010
manylinux2014: MANYLINUX_VERSION_TAG = 2014
manylinux_2_24: MANYLINUX_VERSION_TAG = _2_24
manylinux_2_28: MANYLINUX_VERSION_TAG = _2_28
skip_install = true


Expand Down

0 comments on commit b43a403

Please sign in to comment.