From e286a49881743206dde1b9ad7bbc4df4c8d61dc2 Mon Sep 17 00:00:00 2001 From: Matt Shin Date: Wed, 2 Apr 2025 11:11:32 +0100 Subject: [PATCH 1/2] Prepare 0.6.4 Also update Python versions. --- .github/workflows/pythonapp.yml | 4 ++-- pyproject.toml | 9 +++------ src/yamlprocessor/__init__.py | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 638f0d9..6aeb375 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -8,10 +8,10 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: - python-version: ["3.7", "3.11", "3.12"] + python-version: ["3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/pyproject.toml b/pyproject.toml index 8ca2e1f..64ffbef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ description = "Process values in YAML files" readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.11" license = {file = "LICENSE"} @@ -16,18 +16,15 @@ maintainers = [ ] classifiers = [ - "Development Status :: 4 - Beta", + "Development Status :: 5 - Production/Stable", "Intended Audience :: Science/Research", "Intended Audience :: Developers", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Programming Language :: Python :: 3 :: Only", "Topic :: Scientific/Engineering", "Topic :: Software Development", diff --git a/src/yamlprocessor/__init__.py b/src/yamlprocessor/__init__.py index 37d01f2..7099d32 100644 --- a/src/yamlprocessor/__init__.py +++ b/src/yamlprocessor/__init__.py @@ -1,2 +1,2 @@ """Process YAML include files and variable substitutions.""" -__version__ = '0.6.3' +__version__ = '0.6.4' From 6b7c31ee9f91d81fa3bffe4fc1ef776319a5ee31 Mon Sep 17 00:00:00 2001 From: Matt Shin Date: Wed, 2 Apr 2025 11:21:35 +0100 Subject: [PATCH 2/2] Use latest Python Packaging license syntax Use SPDX license expression. --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 64ffbef..b34a9f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,8 @@ readme = "README.md" requires-python = ">=3.11" -license = {file = "LICENSE"} +license = "BSD-3-Clause" +license-files = ["LICENSE"] maintainers = [ {name = "Matt Shin", email = "matthew.shin@metoffice.gov.uk" } @@ -19,7 +20,6 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Science/Research", "Intended Audience :: Developers", - "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.11",