From 08804581abdceda13c4bb15b915b91dd798a199e Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:03 +0000 Subject: [PATCH 1/4] Bump actions/checkout to v4 --- .github/workflows/omero_plugin.yml | 2 +- .github/workflows/publish_pypi.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/omero_plugin.yml b/.github/workflows/omero_plugin.yml index bb7248f..c2c4da4 100644 --- a/.github/workflows/omero_plugin.yml +++ b/.github/workflows/omero_plugin.yml @@ -23,7 +23,7 @@ jobs: env: STAGE: lib steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Checkout omero-test-infra uses: actions/checkout@master with: diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 81eccda..436eafb 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -7,7 +7,7 @@ jobs: name: Build and publish Python distribution to PyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 - name: Build a binary wheel and a source tarball run: | From 8529fc46274f3f728829167e13e7df603cfc0396 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:22 +0000 Subject: [PATCH 2/4] Bump actions/setup-python to v5 --- .github/workflows/publish_pypi.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 436eafb..3781dfa 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -8,7 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.10' - name: Build a binary wheel and a source tarball run: | python -mpip install wheel From e332e19c82abd1492bc7845f77617a20e4c33be0 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:37 +0000 Subject: [PATCH 3/4] Bump pypa/gh-action-pypi-publish to 1.8.14 --- .github/workflows/publish_pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 3781dfa..666ed3d 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -17,6 +17,6 @@ jobs: python setup.py sdist bdist_wheel - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@v1.3.0 + uses: pypa/gh-action-pypi-publish@v1.8.14 with: password: ${{ secrets.PYPI_PASSWORD }} From b5d953edc0b64a1bba13e9d5d90f3f9e68b7a332 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 16:12:58 +0000 Subject: [PATCH 4/4] Use build instead of sdist --- .github/workflows/publish_pypi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 666ed3d..a735b04 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -13,8 +13,8 @@ jobs: python-version: '3.10' - name: Build a binary wheel and a source tarball run: | - python -mpip install wheel - python setup.py sdist bdist_wheel + python -mpip install build + python -m build - name: Publish distribution to PyPI if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@v1.8.14