From 544f3dfc9c56b72f3a4acef8838a03567ca64693 Mon Sep 17 00:00:00 2001 From: Zuzu-Typ Date: Sun, 29 Oct 2023 12:10:15 +0100 Subject: [PATCH 1/4] Updated deploy workflows to use build module --- .github/workflows/deploy-test-pypi.yml | 5 ++++- .github/workflows/deploy.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-test-pypi.yml b/.github/workflows/deploy-test-pypi.yml index e7290b2..e490dc2 100644 --- a/.github/workflows/deploy-test-pypi.yml +++ b/.github/workflows/deploy-test-pypi.yml @@ -163,9 +163,12 @@ jobs: name: Install Python with: python-version: '3.12' + + - name: Install build + run: pip install build - name: Build sdist - run: python setup.py sdist + run: python -m build --sdist - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4eec81c..0290de2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -167,8 +167,11 @@ jobs: with: python-version: '3.12' + - name: Install build + run: pip install build + - name: Build sdist - run: python setup.py sdist + run: python -m build --sdist - uses: actions/upload-artifact@v3 with: From cd03402025eb1cc1b6a8305cddb2b61512a4a09f Mon Sep 17 00:00:00 2001 From: Zuzu-Typ Date: Sun, 29 Oct 2023 12:35:11 +0100 Subject: [PATCH 2/4] Removed support for deprecated manylinux 2.24 --- .github/workflows/deploy-test-pypi.yml | 8 ++------ .github/workflows/deploy.yml | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-test-pypi.yml b/.github/workflows/deploy-test-pypi.yml index e490dc2..964bf68 100644 --- a/.github/workflows/deploy-test-pypi.yml +++ b/.github/workflows/deploy-test-pypi.yml @@ -74,15 +74,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro: [manylinux_2_24, manylinux_2_28] + distro: [manylinux_2_28] arch: [x86_64, aarch64, s390x] - include: - - distro: manylinux_2_24 - arch: i686 env: CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.distro }} - CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_S390X_IMAGE: ${{ matrix.distro }} CIBW_BUILD: cp3*-manylinux* @@ -94,7 +90,7 @@ jobs: submodules: recursive - name: Set up QEMU - if: ${{ matrix.arch != 'x86_64' && matrix.arch != 'i686' }} + if: ${{ matrix.arch != 'x86_64' }} uses: docker/setup-qemu-action@v3 - uses: actions/setup-python@v4 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0290de2..873b2a0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,15 +77,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro: [manylinux_2_24, manylinux_2_28] + distro: [manylinux_2_28] arch: [x86_64, aarch64, s390x] - include: - - distro: manylinux_2_24 - arch: i686 env: CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.distro }} - CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_S390X_IMAGE: ${{ matrix.distro }} CIBW_BUILD: cp3*-manylinux* @@ -97,7 +93,7 @@ jobs: submodules: recursive - name: Set up QEMU - if: ${{ matrix.arch != 'x86_64' && matrix.arch != 'i686' }} + if: ${{ matrix.arch != 'x86_64' }} uses: docker/setup-qemu-action@v3 - uses: actions/setup-python@v4 From f5f40b8d8574088d9c6d311f924e94149c637349 Mon Sep 17 00:00:00 2001 From: Zuzu-Typ Date: Sun, 29 Oct 2023 12:38:09 +0100 Subject: [PATCH 3/4] Removed support for Python 3.7 --- .github/workflows/deploy-test-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-test-pypi.yml b/.github/workflows/deploy-test-pypi.yml index 964bf68..afe6c40 100644 --- a/.github/workflows/deploy-test-pypi.yml +++ b/.github/workflows/deploy-test-pypi.yml @@ -4,7 +4,7 @@ on: workflow_dispatch env: CIBW_BUILD: cp3* - CIBW_SKIP: cp36-* + CIBW_SKIP: cp36-* cp37-* CIBW_TEST_REQUIRES: pytest CIBW_TEST_COMMAND: pytest {project}/test/PyGLM_test.py -v From 260f937b5924928b7a5b553a06c1528fe5f72756 Mon Sep 17 00:00:00 2001 From: Zuzu-Typ Date: Sun, 29 Oct 2023 13:01:55 +0100 Subject: [PATCH 4/4] Added support for manylinux2014 --- .github/workflows/deploy-test-pypi.yml | 8 ++++++-- .github/workflows/deploy.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-test-pypi.yml b/.github/workflows/deploy-test-pypi.yml index afe6c40..9cfe099 100644 --- a/.github/workflows/deploy-test-pypi.yml +++ b/.github/workflows/deploy-test-pypi.yml @@ -74,11 +74,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro: [manylinux_2_28] + distro: [manylinux2014, manylinux_2_28] arch: [x86_64, aarch64, s390x] + include: + - distro: manylinux2014 + arch: i686 env: CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.distro }} + CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_S390X_IMAGE: ${{ matrix.distro }} CIBW_BUILD: cp3*-manylinux* @@ -90,7 +94,7 @@ jobs: submodules: recursive - name: Set up QEMU - if: ${{ matrix.arch != 'x86_64' }} + if: ${{ matrix.arch != 'x86_64' && matrix.arch != 'i686' }} uses: docker/setup-qemu-action@v3 - uses: actions/setup-python@v4 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 873b2a0..0ba84fc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,11 +77,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro: [manylinux_2_28] + distro: [manylinux2014, manylinux_2_28] arch: [x86_64, aarch64, s390x] + include: + - distro: manylinux2014 + arch: i686 env: CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.distro }} + CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.distro }} CIBW_MANYLINUX_S390X_IMAGE: ${{ matrix.distro }} CIBW_BUILD: cp3*-manylinux* @@ -93,7 +97,7 @@ jobs: submodules: recursive - name: Set up QEMU - if: ${{ matrix.arch != 'x86_64' }} + if: ${{ matrix.arch != 'x86_64' && matrix.arch != 'i686' }} uses: docker/setup-qemu-action@v3 - uses: actions/setup-python@v4