From 775dca6f07e91d820735865bbaf80a9955c60689 Mon Sep 17 00:00:00 2001 From: James B Date: Wed, 22 Jan 2025 08:25:39 +0000 Subject: [PATCH 1/2] Python 3.9+ only (and test on newer versions) --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc9e043..f39bed3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] + python-version: [3.9, "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6989589..873a4a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Changed -Python support is now 3.7+ only +Python support is now 3.9+ only ## [0.2.0] - 2017-11-?? diff --git a/setup.py b/setup.py index 1dd7fe8..1584ea8 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,6 @@ license='BSD', packages=['json_merge_patch'], include_package_data=True, - python_requires=">=3.7", + python_requires=">=3.9", url='https://github.com/open-contracting/json-merge-patch' ) From 7337a9e11d41dcadcab966a1584fb942d003cc85 Mon Sep 17 00:00:00 2001 From: James B Date: Wed, 22 Jan 2025 08:26:34 +0000 Subject: [PATCH 2/2] Github Actions: no cache, update versions --- .github/workflows/ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f39bed3..435a325 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,15 +8,9 @@ jobs: matrix: python-version: [3.9, "3.10", "3.11", "3.12", "3.13"] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v1 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_dev.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - run: pip install -e .[dev] - run: python -m unittest discover