From 0e6e64369005110eea3ff36111935ba4ed870a06 Mon Sep 17 00:00:00 2001 From: Malcolm Mackay Date: Sat, 27 Jun 2020 20:11:42 +0100 Subject: [PATCH 1/6] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index bfa8a49..a7500ec 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -67,7 +67,7 @@ jobs: pip install -r requirements.txt - name: Build manylinux wheel - uses: RalfG/python-wheels-manylinux-build@v0.1 + uses: RalfG/python-wheels-manylinux-build@v0.2.2 with: python-versions: ${{ matrix.python-version.bldstring }} build-requirements: 'cython' From cee2ddc4a771cb1e3525ed5d101a1d567249014b Mon Sep 17 00:00:00 2001 From: Malcolm Mackay Date: Sat, 27 Jun 2020 20:20:30 +0100 Subject: [PATCH 2/6] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index a7500ec..0e660ab 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -45,6 +45,7 @@ jobs: release: runs-on: ubuntu-latest needs: build + if: startsWith(github.event.ref, 'refs/tags') strategy: max-parallel: 4 matrix: @@ -78,7 +79,6 @@ jobs: ls -1 | grep -v 'wscodec.*'${{ matrix.python-version.bldstring }}'-manylinux1_x86_64' | sudo xargs rm -f - name: Publish packages to PyPI if commit is Git tagged. - if: startsWith(github.event.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@master with: user: __token__ From d95332ae60acd84e727588a2c9431d2d7a469cfe Mon Sep 17 00:00:00 2001 From: Malcolm Mackay Date: Sat, 27 Jun 2020 20:32:16 +0100 Subject: [PATCH 3/6] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 0e660ab..3e2bed2 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -75,8 +75,7 @@ jobs: - name: Delete non-wscodec binaries run: | - cd wheelhouse - ls -1 | grep -v 'wscodec.*'${{ matrix.python-version.bldstring }}'-manylinux1_x86_64' | sudo xargs rm -f + ls -1 | grep -v 'wheelhouse/wscodec.*'${{ matrix.python-version.bldstring }}'-manylinux1_x86_64' | sudo xargs rm -f - name: Publish packages to PyPI if commit is Git tagged. uses: pypa/gh-action-pypi-publish@master From 2bcc049b962b8452ef25338627bbe1dcc29bc790 Mon Sep 17 00:00:00 2001 From: Malcolm Mackay Date: Sat, 27 Jun 2020 20:40:43 +0100 Subject: [PATCH 4/6] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 3e2bed2..22dc27e 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -75,14 +75,15 @@ jobs: - name: Delete non-wscodec binaries run: | - ls -1 | grep -v 'wheelhouse/wscodec.*'${{ matrix.python-version.bldstring }}'-manylinux1_x86_64' | sudo xargs rm -f + cd wheelhouse + ls -1 | grep -v 'wscodec.*'${{ matrix.python-version.bldstring }}'-manylinux1_x86_64' | sudo xargs rm -f - name: Publish packages to PyPI if commit is Git tagged. uses: pypa/gh-action-pypi-publish@master with: user: __token__ password: ${{ secrets.pypi_password }} - packages_dir: wheelhouse/ + packages_dir: . release_source: runs-on: ubuntu-latest From 0d01b71a87803c5a88214c353acec365d968c49d Mon Sep 17 00:00:00 2001 From: Malcolm Mackay Date: Sat, 27 Jun 2020 20:47:01 +0100 Subject: [PATCH 5/6] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 22dc27e..24cbe17 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -45,7 +45,6 @@ jobs: release: runs-on: ubuntu-latest needs: build - if: startsWith(github.event.ref, 'refs/tags') strategy: max-parallel: 4 matrix: @@ -77,18 +76,19 @@ jobs: run: | cd wheelhouse ls -1 | grep -v 'wscodec.*'${{ matrix.python-version.bldstring }}'-manylinux1_x86_64' | sudo xargs rm -f + cd .. - name: Publish packages to PyPI if commit is Git tagged. uses: pypa/gh-action-pypi-publish@master with: user: __token__ password: ${{ secrets.pypi_password }} - packages_dir: . + packages_dir: wheelhouse/ release_source: runs-on: ubuntu-latest needs: build - + if: startsWith(github.event.ref, 'refs/tags') steps: - uses: actions/checkout@v1 - name: Set up Python 3.8 From 0fb9dcb7ee3de9b780d67f25f0d31f621c7d268e Mon Sep 17 00:00:00 2001 From: Malcolm Mackay Date: Sat, 27 Jun 2020 20:57:53 +0100 Subject: [PATCH 6/6] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 24cbe17..f652154 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -65,25 +65,20 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt + pip install twine - name: Build manylinux wheel - uses: RalfG/python-wheels-manylinux-build@v0.2.2 + uses: RalfG/python-wheels-manylinux-build@v0.2.2-manylinux2010_x86_64 with: python-versions: ${{ matrix.python-version.bldstring }} build-requirements: 'cython' - - - name: Delete non-wscodec binaries + + - name: Use Twine to upload packages + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.pypi_password }} run: | - cd wheelhouse - ls -1 | grep -v 'wscodec.*'${{ matrix.python-version.bldstring }}'-manylinux1_x86_64' | sudo xargs rm -f - cd .. - - - name: Publish packages to PyPI if commit is Git tagged. - uses: pypa/gh-action-pypi-publish@master - with: - user: __token__ - password: ${{ secrets.pypi_password }} - packages_dir: wheelhouse/ + twine upload wheelhouse/*-manylinux*.whl release_source: runs-on: ubuntu-latest