diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7c7a0e8f..29fc5b2f 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/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index b545042b..815a4c36 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 09405fe9..615011d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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' @@ -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 @@ -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' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 137cdaf4..6ac1ca5b 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 f1d3eccf..e76d943b 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" diff --git a/VERSION b/VERSION index 17e51c38..d917d3e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.1 +0.1.2 diff --git a/pyproject.toml b/pyproject.toml index 00a2bbcc..e72343c8 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 bcc5c572..faea0930 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