From 91eb57d67b8b423c7024aff3f5ac2ea071b65a44 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 19 Jul 2024 11:16:07 -0500 Subject: [PATCH 1/2] publish.yml -> enable sdist build --- .github/workflows/publish.yml | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 10c62f15..289bf88b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,36 +15,23 @@ jobs: with: fetch-depth: 0 # get all history for setuptools_scm - - name: Build wheel + - name: Build sdist and wheel shell: bash run: | pwd ls -lR python3 -m pip install --upgrade pip python3 -m pip -V - python3 -m pip wheel -w wheelhouse . + python3 -m build --outdir wheelhouse python3 -m pip freeze + ls -lR - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - path: ./wheelhouse/build123d*.whl # only store the build123d wheel - - # Do we need sdist wheel? - # build_sdist: - # name: Build source distribution - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - - # - name: Build sdist - # run: pipx run build --sdist - - # - uses: actions/upload-artifact@v3 - # with: - # path: dist/*.tar.gz + path: ./wheelhouse/build123d*.* # store the build123d wheel and sdist upload_pypi: - needs: [build_wheel] #, build_sdist] + needs: [build_wheel] runs-on: ubuntu-latest environment: name: pypi @@ -56,7 +43,7 @@ jobs: if: needs.build_wheel.result == 'success' #if: (github.repository == 'gumyr/build123d' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: # unpacks default artifact into dist/ # if `name: artifact` is omitted, the action will create extra parent dir From 759e8ac41e209e8c0edaf4326627baf21cfcbb7c Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 19 Jul 2024 11:18:25 -0500 Subject: [PATCH 2/2] publish.yml -> install build module --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 289bf88b..a5387e52 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,6 +22,7 @@ jobs: ls -lR python3 -m pip install --upgrade pip python3 -m pip -V + python3 -m pip install build python3 -m build --outdir wheelhouse python3 -m pip freeze ls -lR