diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml new file mode 100644 index 0000000..582dc17 --- /dev/null +++ b/.github/workflows/pypi.yml @@ -0,0 +1,32 @@ +name: Upload release to PyPI (Test & Live) +on: + push: + branches: [main] + release: + types: [published] + +jobs: + pypi-publish: + name: Upload release to PyPI (Test & Live) + runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/json-merge-patch + permissions: + id-token: write # IMPORTANT: this permission is mandatory for trusted publishing + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - run: pip install --upgrade build + - run: python -m build --sdist --wheel + - name: Publish package distributions to TEST PyPI + if: github.event_name == 'push' + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ + skip-existing: true + - name: Publish package distributions to LIVE PyPI + if: github.event_name == 'release' + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 873a4a4..d59df47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [0.3.0] - 2025-03-25 + +## Fixed + +Remove invalid dash-separated key 'description-file' in our packaging info https://github.com/OpenDataServices/json-merge-patch/pull/9 + ## Changed Python support is now 3.9+ only diff --git a/setup.cfg b/setup.cfg index b88034e..8b13789 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1 @@ -[metadata] -description-file = README.md + diff --git a/setup.py b/setup.py index 1584ea8..8e0698b 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup setup(name='json-merge-patch', - version='0.2', + version='0.3.0', description='JSON Merge Patch library (https://tools.ietf.org/html/rfc7386)', author='Open Data Services', author_email='code@opendataservices.coop',