From 4cc95056bd66797332edb7e4ffb759e910ca981e Mon Sep 17 00:00:00 2001 From: David Collom Date: Mon, 8 Mar 2021 15:24:18 -0800 Subject: [PATCH 1/2] Use setuptools_scm in setup.cfg --- setup.cfg | 4 +++- setup.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7d137a0..0ad068b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = tom-registration -version = 0.1 description = Reusable TOMToolkit app to support multiple user registration flows. long_description = file: README.md long_description_content_type = text/markdown @@ -32,6 +31,9 @@ keywords = science [options] +setup_requires = + setuptools_scm + wheel install_requires = tomtoolkit >= 2.5 include_package_data = true diff --git a/setup.py b/setup.py index 3898ed7..906daec 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ from setuptools import setup -setup() # configuration resides in setup.cfg file +setup( # configuration resides in setup.cfg file + use_scm_version=True, # setuptools_scm does not support setup.cfg +) From c9fd13a0e4a83bf5017ab8d7816266b24e8b0c3e Mon Sep 17 00:00:00 2001 From: David Collom Date: Mon, 8 Mar 2021 15:30:59 -0800 Subject: [PATCH 2/2] Updating release workflow to use proper token name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c118393..9ef472f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: - name: Build package and publish to PyPi env: TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_TOMTOOLKIT_API_TOKEN }} + TWINE_PASSWORD: ${{ secrets.PYPI_TOM_REGISTRATION_API_TOKEN }} run: | python setup.py sdist bdist_wheel twine upload dist/*