diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 30fccba..df63d45 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,6 +15,8 @@ jobs: environment: deploy permissions: id-token: write # For PyPI trusted publishers. + env: + SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.version }} steps: - uses: actions/checkout@v3 @@ -29,7 +31,7 @@ jobs: path: dist - name: Publish package to PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@v1.8.5 - uses: actions-ecosystem/action-push-tag@v1 with: diff --git a/RELEASING.rst b/RELEASING.rst index 50be392..8db6e7c 100644 --- a/RELEASING.rst +++ b/RELEASING.rst @@ -1,7 +1,7 @@ Here are the steps on how to make a new release. -1. Create a ``release-VERSION`` branch from ``upstream/master``. +1. Create a ``release-VERSION`` branch from ``upstream/main``. 2. Update ``CHANGELOG.rst``. -3. Push a branch with the changes. -4. Once all builds pass, run the ``deploy`` workflow manually. +3. Push the branch to ``upstream``. +4. Once all tests pass, start the ``deploy`` workflow manually. 5. Merge the PR.