From 4de044fb2babf227914b390895f5f0d7ba73bf5b Mon Sep 17 00:00:00 2001 From: Lui Pillmann Date: Fri, 15 Aug 2025 17:15:03 +0200 Subject: [PATCH 1/7] Bump version to 0.1.2 --- .bumpversion.cfg | 2 +- VERSION | 2 +- pyproject.toml | 2 +- src/permifrost/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7c7a0e8fd..29fc5b2f5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.1 +current_version = 0.1.2 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/VERSION b/VERSION index 17e51c385..d917d3e26 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.1 +0.1.2 diff --git a/pyproject.toml b/pyproject.toml index 00a2bbccb..e72343c82 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "gemma.permifrost" -version = "0.1.1" +version = "0.1.2" description = "Permifrost Permissions - Fork by Gemma Analytics" readme = "README.md" license = {text = "MIT"} diff --git a/src/permifrost/__init__.py b/src/permifrost/__init__.py index bcc5c572a..faea0930d 100644 --- a/src/permifrost/__init__.py +++ b/src/permifrost/__init__.py @@ -1,5 +1,5 @@ # Managed by bumpversion -__version__ = "0.1.1" +__version__ = "0.1.2" from permifrost.error import SpecLoadingError From b3ac9f088f859d7a5e39f5e63ee9d8a08f1cb3bf Mon Sep 17 00:00:00 2001 From: Lui Pillmann Date: Fri, 15 Aug 2025 17:20:09 +0200 Subject: [PATCH 2/7] Fix the release process --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09405fe98..2234a058f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,6 +20,9 @@ jobs: name: Release to Test PyPI runs-on: ubuntu-latest if: github.event_name == 'pull_request' && github.event.pull_request.state == 'open' + permissions: + id-token: write + contents: read steps: - name: Checkout code uses: actions/checkout@v4 @@ -99,6 +102,9 @@ jobs: name: Release to Production PyPI runs-on: ubuntu-latest if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') + permissions: + id-token: write + contents: read steps: - name: Checkout code uses: actions/checkout@v4 From fc9adf2253013e2685efb49d28a9ead5c9a418d2 Mon Sep 17 00:00:00 2001 From: Lui Pillmann Date: Fri, 15 Aug 2025 17:40:19 +0200 Subject: [PATCH 3/7] Use simple shell command instead of github action --- .github/workflows/release.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2234a058f..95da5aaf1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,11 +68,10 @@ jobs: - name: Publish to Test PyPI if: steps.check_version.outputs.version_changed == 'true' - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository-url: https://test.pypi.org/legacy/ - skip-existing: true + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }} + run: twine upload dist/* - name: Comment on PR if: steps.check_version.outputs.version_changed == 'true' @@ -149,10 +148,10 @@ jobs: - name: Publish to Production PyPI if: steps.check_version.outputs.version_changed == 'true' - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.PYPI_API_TOKEN }} - skip-existing: true + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} + run: twine upload dist/* - name: Create Release if: steps.check_version.outputs.version_changed == 'true' From 51868aea18cc34df73bc0c6b47fbebb762e94df1 Mon Sep 17 00:00:00 2001 From: Lui Pillmann Date: Fri, 15 Aug 2025 17:52:08 +0200 Subject: [PATCH 4/7] Simplify build commands --- .github/workflows/manual-release.yml | 6 ++---- .github/workflows/release.yml | 24 ++++++++---------------- .github/workflows/test.yml | 6 ++---- Makefile | 3 --- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index b545042b5..815a4c36a 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -54,12 +54,10 @@ jobs: pip install '.[dev]' - name: Build package - run: | - make dist-local + run: python -m build - name: Check package - run: | - twine check dist/* + run: twine check dist/* - name: Publish to Test PyPI if: inputs.target == 'test' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95da5aaf1..615011d4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,9 +20,7 @@ jobs: name: Release to Test PyPI runs-on: ubuntu-latest if: github.event_name == 'pull_request' && github.event.pull_request.state == 'open' - permissions: - id-token: write - contents: read + steps: - name: Checkout code uses: actions/checkout@v4 @@ -58,20 +56,18 @@ jobs: - name: Build package if: steps.check_version.outputs.version_changed == 'true' - run: | - make dist-local + run: python -m build - name: Check package if: steps.check_version.outputs.version_changed == 'true' - run: | - twine check dist/* + run: twine check dist/* - - name: Publish to Test PyPI + - name: Publish to TestPyPI if: steps.check_version.outputs.version_changed == 'true' env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }} - run: twine upload dist/* + run: twine upload --repository testpypi dist/* - name: Comment on PR if: steps.check_version.outputs.version_changed == 'true' @@ -101,9 +97,7 @@ jobs: name: Release to Production PyPI runs-on: ubuntu-latest if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') - permissions: - id-token: write - contents: read + steps: - name: Checkout code uses: actions/checkout@v4 @@ -138,13 +132,11 @@ jobs: - name: Build package if: steps.check_version.outputs.version_changed == 'true' - run: | - make dist-local + run: python -m build - name: Check package if: steps.check_version.outputs.version_changed == 'true' - run: | - twine check dist/* + run: twine check dist/* - name: Publish to Production PyPI if: steps.check_version.outputs.version_changed == 'true' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 137cdaf44..6ac1ca5bc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -80,12 +80,10 @@ jobs: pip install '.[dev]' - name: Build package - run: | - make dist-local + run: python -m build - name: Check package - run: | - twine check dist/* + run: twine check dist/* - name: Test package installation run: | diff --git a/Makefile b/Makefile index f1d3eccf0..e76d943b5 100644 --- a/Makefile +++ b/Makefile @@ -165,9 +165,6 @@ dist: compose-build @docker-compose run permifrost /bin/bash \ -c "python setup.py sdist" -dist-local: - python -m build - docker-clean: @docker-compose run permifrost /bin/bash \ -c "rm -rf dist" From 2f94f62072b0ad8465397e84633179ce2a9e4a6a Mon Sep 17 00:00:00 2001 From: Lui Pillmann Date: Fri, 15 Aug 2025 17:58:42 +0200 Subject: [PATCH 5/7] Tests run only on PRs --- .github/workflows/test.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ac1ca5bc..103f50c1c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,16 +8,6 @@ on: - 'tests/**' - 'setup.py' - 'pyproject.toml' - push: - branches: - - main - - master - paths: - - 'VERSION' - - 'src/**' - - 'tests/**' - - 'setup.py' - - 'pyproject.toml' env: PYTHON_VERSION: "3.10" From 0888f84623541f85c145b9cbc24ae310d0cc162f Mon Sep 17 00:00:00 2001 From: Lui Pillmann Date: Fri, 15 Aug 2025 18:00:32 +0200 Subject: [PATCH 6/7] Fix get version step --- .github/workflows/release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 615011d4d..82fae5a62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,6 +145,13 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} run: twine upload dist/* + - name: Get version + if: steps.check_version.outputs.version_changed == 'true' + id: get_version + run: | + version=$(cat VERSION) + echo "version=$version" >> $GITHUB_OUTPUT + - name: Create Release if: steps.check_version.outputs.version_changed == 'true' uses: actions/create-release@v1 @@ -166,10 +173,3 @@ jobs: **PyPI URL:** https://pypi.org/project/gemma.permifrost/ draft: false prerelease: false - - - name: Get version - if: steps.check_version.outputs.version_changed == 'true' - id: get_version - run: | - version=$(cat VERSION) - echo "version=$version" >> $GITHUB_OUTPUT From ce297d2eaa4424da437a94a366f829d56432f921 Mon Sep 17 00:00:00 2001 From: Lui Pillmann Date: Fri, 15 Aug 2025 18:00:55 +0200 Subject: [PATCH 7/7] Bump version to 0.1.3 --- .bumpversion.cfg | 2 +- VERSION | 2 +- pyproject.toml | 2 +- src/permifrost/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 29fc5b2f5..43fbafb71 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.2 +current_version = 0.1.3 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/VERSION b/VERSION index d917d3e26..b1e80bb24 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.2 +0.1.3 diff --git a/pyproject.toml b/pyproject.toml index e72343c82..b7d3efffb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "gemma.permifrost" -version = "0.1.2" +version = "0.1.3" description = "Permifrost Permissions - Fork by Gemma Analytics" readme = "README.md" license = {text = "MIT"} diff --git a/src/permifrost/__init__.py b/src/permifrost/__init__.py index faea0930d..7ddb6cdb5 100644 --- a/src/permifrost/__init__.py +++ b/src/permifrost/__init__.py @@ -1,5 +1,5 @@ # Managed by bumpversion -__version__ = "0.1.2" +__version__ = "0.1.3" from permifrost.error import SpecLoadingError