Skip to content

Commit 1c3ca78

Browse files
authored
Merge pull request #12 from OpenDataServices/2025-03-25
Remove invalid dash-separated key 'description-file' & PYPI releases & release 0.3.0
2 parents 88a9651 + 8c036be commit 1c3ca78

File tree

4 files changed

+40
-3
lines changed

4 files changed

+40
-3
lines changed

.github/workflows/pypi.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Upload release to PyPI (Test & Live)
2+
on:
3+
push:
4+
branches: [main]
5+
release:
6+
types: [published]
7+
8+
jobs:
9+
pypi-publish:
10+
name: Upload release to PyPI (Test & Live)
11+
runs-on: ubuntu-latest
12+
environment:
13+
name: pypi
14+
url: https://pypi.org/p/json-merge-patch
15+
permissions:
16+
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-python@v5
20+
with:
21+
python-version: '3.12'
22+
- run: pip install --upgrade build
23+
- run: python -m build --sdist --wheel
24+
- name: Publish package distributions to TEST PyPI
25+
if: github.event_name == 'push'
26+
uses: pypa/gh-action-pypi-publish@release/v1
27+
with:
28+
repository-url: https://test.pypi.org/legacy/
29+
skip-existing: true
30+
- name: Publish package distributions to LIVE PyPI
31+
if: github.event_name == 'release'
32+
uses: pypa/gh-action-pypi-publish@release/v1

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [Unreleased]
88

9+
## [0.3.0] - 2025-03-25
10+
11+
## Fixed
12+
13+
Remove invalid dash-separated key 'description-file' in our packaging info https://github.com/OpenDataServices/json-merge-patch/pull/9
14+
915
## Changed
1016

1117
Python support is now 3.9+ only

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
[metadata]
2-
description-file = README.md
1+

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from setuptools import setup
22
setup(name='json-merge-patch',
3-
version='0.2',
3+
version='0.3.0',
44
description='JSON Merge Patch library (https://tools.ietf.org/html/rfc7386)',
55
author='Open Data Services',
66
author_email='[email protected]',

0 commit comments

Comments
 (0)