From e2e09a31817da9fad5ededa34b9a21daf314ab66 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Sun, 16 Feb 2025 16:40:07 +0900 Subject: [PATCH 1/4] build: remove Python 3.8 (EOL), add 3.13 --- .github/workflows/python.yml | 10 +--------- Dockerfile | 2 +- README.rst | 2 +- requirements_ci.txt | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index c70f8ab..9c93d95 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,12 +12,8 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.8', 'pypy3.8', '3.9', 'pypy3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', 'pypy3.9', '3.10', '3.11', '3.12', '3.13'] exclude: - - os: macos-latest - python-version: '3.8' - - os: macos-latest - python-version: 'pypy3.8' - os: macos-latest python-version: '3.9' - os: macos-latest @@ -25,10 +21,6 @@ jobs: - os: macos-latest python-version: '3.10' include: - - os: macos-13 - python-version: '3.8' - - os: macos-13 - python-version: 'pypy3.8' - os: macos-13 python-version: '3.9' - os: macos-13 diff --git a/Dockerfile b/Dockerfile index 333b73f..cf69741 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION="3.12" +ARG PYTHON_VERSION="3.13" FROM python:${PYTHON_VERSION} diff --git a/README.rst b/README.rst index 18ae7e4..ec8a26d 100644 --- a/README.rst +++ b/README.rst @@ -436,7 +436,7 @@ using version-query without any issues. Requirements ============ -Python version 3.8 or later. +Python version 3.9 or later. Python libraries as specified in ``_. diff --git a/requirements_ci.txt b/requirements_ci.txt index 29b1cc4..82f99f3 100644 --- a/requirements_ci.txt +++ b/requirements_ci.txt @@ -1,7 +1,7 @@ -r requirements_test.txt codecov ~= 2.1 coverage ~= 7.2 -flake518 ~= 1.6; python_version >= '3.9' +flake518 ~= 1.6 mypy ~= 1.5 pydocstyle ~= 6.3 pylint ~= 3.1 diff --git a/setup.py b/setup.py index ae2283a..dc24b5b 100644 --- a/setup.py +++ b/setup.py @@ -20,11 +20,11 @@ class Package(boilerplates.setup.Package): 'Operating System :: MacOS', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX :: Linux', - '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 :: Software Development :: Version Control', 'Topic :: Software Development :: Version Control :: Git', From 8648af6f2b730b087a6c9ef924b2eed4df56e12b Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Sun, 16 Feb 2025 16:44:34 +0900 Subject: [PATCH 2/4] chore: update copyright year --- NOTICE | 2 +- version_query/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index 86e39d7..11992d3 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ version-query -Copyright (c) 2017-2024 Mateusz Bysiek https://mbdevpl.github.io/ +Copyright (c) 2017-2025 Mateusz Bysiek https://mbdevpl.github.io/ Copyright (c) 2020 John Vandenberg https://github.com/jayvdb Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/version_query/main.py b/version_query/main.py index 386ab18..5084d05 100644 --- a/version_query/main.py +++ b/version_query/main.py @@ -20,7 +20,7 @@ def main(args=None, namespace=None) -> None: description='''Tool for querying current versions of Python packages. Use LOGGING_LEVEL environment variable to adjust logging level.''', epilog=make_copyright_notice( - 2017, 2024, author='the contributors', url='https://github.com/mbdevpl/version-query'), + 2017, 2025, author='the contributors', url='https://github.com/mbdevpl/version-query'), formatter_class=argparse.ArgumentDefaultsHelpFormatter) add_version_option(parser, VERSION) From 04f95ad94fab81a41d452685a8fd23891a4528d0 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Sun, 16 Feb 2025 16:56:00 +0900 Subject: [PATCH 3/4] build: make build requirements consistent with requirements.txt --- pyproject.toml | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 72689bf..c096b45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,8 +2,8 @@ requires = [ 'boilerplates[setup] ~= 1.0', 'GitPython ~= 3.1', - 'packaging >= 23.0', - 'semver ~= 2.13' + 'packaging >= 24.0', + 'semver ~= 2.13, < 3.1' ] [tool.flake8] diff --git a/requirements.txt b/requirements.txt index 44debfe..fc09370 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ boilerplates[cli,logging] ~= 1.0 GitPython ~= 3.1 -packaging >= 23.0 +packaging >= 24.0 semver >= 2.13, < 3.1 From 35362a492197b427e3ffa10b5c41189f34f1b4d0 Mon Sep 17 00:00:00 2001 From: Mateusz Bysiek Date: Sun, 16 Feb 2025 16:57:36 +0900 Subject: [PATCH 4/4] build: test on pypy 3.10 --- .github/workflows/python.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 9c93d95..647d244 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.9', 'pypy3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: ['3.9', 'pypy3.9', '3.10', 'pypy3.10', '3.11', '3.12', '3.13'] exclude: - os: macos-latest python-version: '3.9' @@ -20,6 +20,8 @@ jobs: python-version: 'pypy3.9' - os: macos-latest python-version: '3.10' + - os: macos-latest + python-version: 'pypy3.10' include: - os: macos-13 python-version: '3.9' @@ -27,6 +29,8 @@ jobs: python-version: 'pypy3.9' - os: macos-13 python-version: '3.10' + - os: macos-13 + python-version: 'pypy3.10' steps: - uses: actions/checkout@v4 with: