From 513091cabe1e18963fd854eada4f4cb61d6cdb05 Mon Sep 17 00:00:00 2001 From: Zhang Yunjun Date: Tue, 22 Aug 2023 10:10:38 +0800 Subject: [PATCH] pub2pypi: fix unknow dist format error + fix the following error by turning on the `merge-multiple` option, as suggested by download-artifact readme - Checking dist/artifact-source: ERROR InvalidDistribution: Unknown distribution format: 'artifact-source' + Display the structure of downloaded artifact files, to facilitate the debuging in the future, since this part is easy to have issues + update deprecated option names in gh-action-pypi-publish + README: fix typo --- .github/workflows/build-and-publish-to-pypi.yml | 9 ++++++--- README.md | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-publish-to-pypi.yml b/.github/workflows/build-and-publish-to-pypi.yml index c5e2377..d603404 100644 --- a/.github/workflows/build-and-publish-to-pypi.yml +++ b/.github/workflows/build-and-publish-to-pypi.yml @@ -85,16 +85,19 @@ jobs: with: # unpacks default artifact into dist/ # if `name: artifact` is omitted, the action will create extra parent dir - pattern: artifact-* path: dist + pattern: artifact-* + merge-multiple: true + - name: Display structure of downloaded files + run: ls -R dist - name: Publish developed version 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ - skip_existing: false + repository-url: https://test.pypi.org/legacy/ + skip-existing: false verbose: true - name: Publish released version 📦 to PyPI diff --git a/README.md b/README.md index 8eececd..1545ea6 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This is research code provided to you "as is" with NO WARRANTIES OF CORRECTNESS. ### 1. Install -PySolid is available on the [conda-forge](https://anaconda.org/conda-forge/pysolid) channel and the main archive of the [Debian](https://tracker.debian.org/pkg/pysolid) GNU/Linux OS. The released version can be install via `conda` as: +PySolid is available on the [conda-forge](https://anaconda.org/conda-forge/pysolid) channel and the main archive of the [Debian](https://tracker.debian.org/pkg/pysolid) GNU/Linux OS. The released version can be installed via `conda` as: ```shell # run "conda update pysolid" to update the installed version