From 2dbead3764d9cffed593584f98375a3abaea90b0 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 17:24:15 +0000 Subject: [PATCH 1/6] Bump actions/checkout to v4 --- .github/workflows/publish_pypi.yml | 2 +- .github/workflows/tox.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: | diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 2fa343a..f0d04c6 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -16,7 +16,7 @@ jobs: - '3.10' runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} From c72f10672614ca351782da652fa90f75ba8e83c7 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 17:24:53 +0000 Subject: [PATCH 2/6] Bump actions/setup-python to v5 --- .github/workflows/publish_pypi.yml | 4 +++- .github/workflows/tox.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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 diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index f0d04c6..fc77365 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From 794d2085e504230d32768803208f6a8c08574015 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 17:25:21 +0000 Subject: [PATCH 3/6] 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 8f4d60a668b28659a865f86af0e52a440e776454 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 17:25:44 +0000 Subject: [PATCH 4/6] 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 From 8a691d97a9cc7602fad9eb2ef0ed2fc19b02a195 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 17:35:33 +0000 Subject: [PATCH 5/6] Upgrade command --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 03f2e22..9018127 100644 --- a/tox.ini +++ b/tox.ini @@ -28,5 +28,6 @@ passenv = commands = pre-commit run --all-files rst-lint README.rst - python setup.py sdist install --record files.txt + python -m pip install build + python -m build --record files.txt pytest {posargs:-n4 -rf test -s} From 3b46deed34e06dd9b1080e85972eeb3739d0bb6e Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 21 Nov 2024 17:37:54 +0000 Subject: [PATCH 6/6] Remove record flag --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9018127..e6ff568 100644 --- a/tox.ini +++ b/tox.ini @@ -29,5 +29,5 @@ commands = pre-commit run --all-files rst-lint README.rst python -m pip install build - python -m build --record files.txt + python -m build pytest {posargs:-n4 -rf test -s}