From c46949cbf771f68390b557c5316f8ab1639308e8 Mon Sep 17 00:00:00 2001 From: Kimball Hill Date: Tue, 28 Jun 2022 12:37:34 -0600 Subject: [PATCH 1/6] get version from release --- .github/workflows/publish.yaml | 28 ++++++++++++++++------ rasgotransforms/rasgotransforms/version.py | 2 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5a5d041c..a61e52e3 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -26,12 +26,26 @@ jobs: pip install setuptools wheel twine --upgrade pip install -r rasgotransforms/requirements.txt + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} - - name: Build and publish - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + - name: Update version + run: echo __version__ = \"${{ steps.get_version.outputs.VERSION }}\" > rasgotransforms/rasgotransforms/version.py + + - name: Commit and push version bump run: | - cd rasgotransforms - python setup.py sdist bdist_wheel - twine upload dist/* + git config --global user.name "github-actions" + git config user.email "github-actions@github.com" + git add . + git commit -m "Update version" + git push + +# - name: Build and publish +# env: +# TWINE_USERNAME: __token__ +# TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} +# run: | +# cd rasgotransforms +# python setup.py sdist bdist_wheel +# twine upload dist/* diff --git a/rasgotransforms/rasgotransforms/version.py b/rasgotransforms/rasgotransforms/version.py index ade59200..444b0559 100644 --- a/rasgotransforms/rasgotransforms/version.py +++ b/rasgotransforms/rasgotransforms/version.py @@ -2,4 +2,4 @@ Package version for pypi """ -__version__ = "1.10.1" +__version__ = "2.0.0a" From 37c77be72228acfeaa9a23474b43dd686b5dc816 Mon Sep 17 00:00:00 2001 From: Kimball Hill Date: Wed, 29 Jun 2022 08:29:32 -0600 Subject: [PATCH 2/6] remove comment --- .github/workflows/publish.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a61e52e3..cb5a2a29 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -41,11 +41,11 @@ jobs: git commit -m "Update version" git push -# - name: Build and publish -# env: -# TWINE_USERNAME: __token__ -# TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} -# run: | -# cd rasgotransforms -# python setup.py sdist bdist_wheel -# twine upload dist/* + - name: Build and publish + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + run: | + cd rasgotransforms + python setup.py sdist bdist_wheel + twine upload dist/* From cabb46b9e0f58ccd5528d474ce454c357f239d95 Mon Sep 17 00:00:00 2001 From: Kimball Hill Date: Wed, 29 Jun 2022 08:34:03 -0600 Subject: [PATCH 3/6] revert version --- rasgotransforms/rasgotransforms/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasgotransforms/rasgotransforms/version.py b/rasgotransforms/rasgotransforms/version.py index 444b0559..ade59200 100644 --- a/rasgotransforms/rasgotransforms/version.py +++ b/rasgotransforms/rasgotransforms/version.py @@ -2,4 +2,4 @@ Package version for pypi """ -__version__ = "2.0.0a" +__version__ = "1.10.1" From 0ca1d962dfdb33fd2cc966b6e40f32fdb6a3c3ae Mon Sep 17 00:00:00 2001 From: Kimball Hill Date: Wed, 29 Jun 2022 08:35:29 -0600 Subject: [PATCH 4/6] only commit version.py --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index cb5a2a29..e94389b3 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -37,7 +37,7 @@ jobs: run: | git config --global user.name "github-actions" git config user.email "github-actions@github.com" - git add . + git add rasgotransforms/rasgotransforms/version.py git commit -m "Update version" git push From 0449ff8b787cf3396c7814f7be93c593060bbc22 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 14:37:16 +0000 Subject: [PATCH 5/6] [pre-commit.ci] auto fixes from pre-commit.com hooks --- rasgotransforms/rasgotransforms/accelerators/gaps_check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasgotransforms/rasgotransforms/accelerators/gaps_check.yaml b/rasgotransforms/rasgotransforms/accelerators/gaps_check.yaml index c906c4c1..b56ca3d0 100644 --- a/rasgotransforms/rasgotransforms/accelerators/gaps_check.yaml +++ b/rasgotransforms/rasgotransforms/accelerators/gaps_check.yaml @@ -73,4 +73,4 @@ operations: - ISLAND_START_DATETIME - ISLAND_ROW_COUNT - ISLAND_DURATION_{{buffer_date_part}} - source_table: '{{rename}}' \ No newline at end of file + source_table: '{{rename}}' From 803caba842675d59f407409ebc35b3809a4f6f3c Mon Sep 17 00:00:00 2001 From: Kimball Hill Date: Wed, 29 Jun 2022 09:59:20 -0600 Subject: [PATCH 6/6] verify version matches release tag --- .github/workflows/publish.yaml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e94389b3..2f854ef2 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -26,20 +26,11 @@ jobs: pip install setuptools wheel twine --upgrade pip install -r rasgotransforms/requirements.txt - - name: Get the version - id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} - - - name: Update version - run: echo __version__ = \"${{ steps.get_version.outputs.VERSION }}\" > rasgotransforms/rasgotransforms/version.py - - - name: Commit and push version bump + - name: Verify version run: | - git config --global user.name "github-actions" - git config user.email "github-actions@github.com" - git add rasgotransforms/rasgotransforms/version.py - git commit -m "Update version" - git push + cd rasgotransforms/rasgotransforms + python -c "from version import __version__; assert __version__ == \"${GITHUB_REF#refs/tags/}\", \"Versions don\'t match\"" + cd ../.. - name: Build and publish env: