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
32 changes: 32 additions & 0 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
[metadata]
description-file = README.md

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -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='[email protected]',
Expand Down