Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.1
current_version = 0.1.2
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/manual-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
33 changes: 15 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
name: Release to Test PyPI
runs-on: ubuntu-latest
if: github.event_name == 'pull_request' && github.event.pull_request.state == 'open'

steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -55,21 +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'
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 --repository testpypi dist/*

- name: Comment on PR
if: steps.check_version.outputs.version_changed == 'true'
Expand Down Expand Up @@ -99,6 +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')

steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -133,20 +132,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 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'
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.1
0.1.2
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion src/permifrost/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Managed by bumpversion
__version__ = "0.1.1"
__version__ = "0.1.2"

from permifrost.error import SpecLoadingError

Expand Down