From a928f887cc577913ec861fb329990cec9951a5e7 Mon Sep 17 00:00:00 2001 From: Panos Date: Sat, 3 Dec 2022 19:12:42 +0000 Subject: [PATCH 1/4] Updated cfg --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 515f5dbb..995533c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -141,20 +141,20 @@ workflows: matrix: parameters: python_ver: - - "3.6" - - "3.8" - - "3.9" +# - "3.6" +# - "3.8" +# - "3.9" - "3.11" filters: tags: ignore: /.*/ - manylinux-x86_64: &manylinux-wf context: Docker - filters: - tags: - only: /.*/ - branches: - ignore: /.*/ +# filters: +# tags: +# only: /.*/ +# branches: +# ignore: /.*/ - manylinux-aarch64: *manylinux-wf - osx: matrix: From be04f1c01db0a5c5bcb90097e077cf9fe035ebc9 Mon Sep 17 00:00:00 2001 From: Panos Date: Sat, 3 Dec 2022 20:08:12 +0000 Subject: [PATCH 2/4] Updated changelog, manylinux scripts. --- Changelog.rst | 1 + ci/build-manylinux.sh | 4 ++-- ci/build-wheels.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index 69cb0acd..8ed7918d 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -14,6 +14,7 @@ Packaging * Upgraded wheel OpenSSL to 1.1.1q. * Added testing for Python 3.11, removed 3.10. +* Added manylinux 2.24 wheel builds for x86_64 and AARCH64 (ARM64). * Added Windows wheel build for Python 3.11. * Added OSX 12.0 wheels. * Removed OSX <= 10.0 wheels. diff --git a/ci/build-manylinux.sh b/ci/build-manylinux.sh index c812c25f..82772492 100755 --- a/ci/build-manylinux.sh +++ b/ci/build-manylinux.sh @@ -21,7 +21,7 @@ docker_files=( "ci/docker/manylinux/Dockerfile" "ci/docker/manylinux/Dockerfile.2014_x86_64" "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64" - "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64" +# "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64" ) rm -rf local build ssh/libssh.* ssh/*.so @@ -31,7 +31,7 @@ if [[ $(uname -m) == "aarch64" ]]; then docker_files=( "ci/docker/manylinux/Dockerfile.aarch64" "ci/docker/manylinux/Dockerfile.aarch64_2_24" - "ci/docker/manylinux/Dockerfile.aarch64_2_28" +# "ci/docker/manylinux/Dockerfile.aarch64_2_28" ) fi diff --git a/ci/build-wheels.sh b/ci/build-wheels.sh index 2d6eaddb..58a247d7 100755 --- a/ci/build-wheels.sh +++ b/ci/build-wheels.sh @@ -18,7 +18,7 @@ # Compile wheels rm -rf /io/build # For testing -#for PYBIN in $(ls -1d /opt/python/cp36-cp36m/bin | grep -v cpython); do +#for PYBIN in $(ls -1d /opt/python/cp310-cp310/bin | grep -v cpython); do for PYBIN in $(ls -1d /opt/python/*/bin | grep -v cpython); do "${PYBIN}/pip" wheel /io/ -w wheelhouse/ done @@ -29,7 +29,7 @@ for whl in wheelhouse/*.whl; do done # Install packages and test -#for PYBIN in $(ls -1d /opt/python/cp36-cp36m/bin | grep -v cpython); do +#for PYBIN in $(ls -1d /opt/python/cp310-cp310/bin | grep -v cpython); do for PYBIN in $(ls -1d /opt/python/*/bin | grep -v cpython); do "${PYBIN}/pip" install ssh-python --no-index -f /io/wheelhouse (cd "$HOME"; "${PYBIN}/python" -c 'from ssh.session import Session; Session()') From 81bdc1a1e88a653c7fa5af069afc1be71b788b98 Mon Sep 17 00:00:00 2001 From: Panos Date: Sat, 3 Dec 2022 20:11:27 +0000 Subject: [PATCH 3/4] Updated changelog, ci cfg. --- .circleci/config.yml | 16 ++++++++-------- Changelog.rst | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 995533c4..515f5dbb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -141,20 +141,20 @@ workflows: matrix: parameters: python_ver: -# - "3.6" -# - "3.8" -# - "3.9" + - "3.6" + - "3.8" + - "3.9" - "3.11" filters: tags: ignore: /.*/ - manylinux-x86_64: &manylinux-wf context: Docker -# filters: -# tags: -# only: /.*/ -# branches: -# ignore: /.*/ + filters: + tags: + only: /.*/ + branches: + ignore: /.*/ - manylinux-aarch64: *manylinux-wf - osx: matrix: diff --git a/Changelog.rst b/Changelog.rst index 8ed7918d..fea5b5ef 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -14,7 +14,7 @@ Packaging * Upgraded wheel OpenSSL to 1.1.1q. * Added testing for Python 3.11, removed 3.10. -* Added manylinux 2.24 wheel builds for x86_64 and AARCH64 (ARM64). +* Added manylinux 2.24 wheel builds AMD64 and ARM (AArch64), all supported Python versions. * Added Windows wheel build for Python 3.11. * Added OSX 12.0 wheels. * Removed OSX <= 10.0 wheels. From eb08c1f71a86686f58da5691ef5645b59b6e357f Mon Sep 17 00:00:00 2001 From: Panos Date: Sat, 3 Dec 2022 20:29:24 +0000 Subject: [PATCH 4/4] Updated changelog, ci cfg. --- Changelog.rst | 1 - ci/build-manylinux.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index fea5b5ef..69cb0acd 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -14,7 +14,6 @@ Packaging * Upgraded wheel OpenSSL to 1.1.1q. * Added testing for Python 3.11, removed 3.10. -* Added manylinux 2.24 wheel builds AMD64 and ARM (AArch64), all supported Python versions. * Added Windows wheel build for Python 3.11. * Added OSX 12.0 wheels. * Removed OSX <= 10.0 wheels. diff --git a/ci/build-manylinux.sh b/ci/build-manylinux.sh index 82772492..593d4385 100755 --- a/ci/build-manylinux.sh +++ b/ci/build-manylinux.sh @@ -20,7 +20,7 @@ docker_repo="parallelssh/ssh-manylinux" docker_files=( "ci/docker/manylinux/Dockerfile" "ci/docker/manylinux/Dockerfile.2014_x86_64" - "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64" +# "ci/docker/manylinux/Dockerfile.manylinux_2_24_x86_64" # "ci/docker/manylinux/Dockerfile.manylinux_2_28_x86_64" ) @@ -30,7 +30,7 @@ python ci/appveyor/fix_version.py . if [[ $(uname -m) == "aarch64" ]]; then docker_files=( "ci/docker/manylinux/Dockerfile.aarch64" - "ci/docker/manylinux/Dockerfile.aarch64_2_24" +# "ci/docker/manylinux/Dockerfile.aarch64_2_24" # "ci/docker/manylinux/Dockerfile.aarch64_2_28" ) fi