From f81ae0314363f35e36e01926a3a87d67eea50c39 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 7 Jan 2023 12:36:41 +0100 Subject: [PATCH 01/11] fix #26 - list individuals in license file --- LICENSE | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 31ecdfb..46f4b28 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,21 @@ +The MIT License (MIT) - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. +Copyright (c) 2010 - 2023 Holger Krekel and others +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 41e5fff6401fc270da6bd5114c8cd2a0ccf9885a Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 7 Jan 2023 12:19:35 -0300 Subject: [PATCH 02/11] Run tests in CI The current setup was not actually running the tests, only installing the package. --- .github/workflows/main.yml | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 524973f..1f9f127 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,10 +19,10 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - - name: Install tox - run: python -m pip install --upgrade pip setuptools_scm hatch hatch-vcs - - name: install package local - run: pip install --no-build-isolation . + - name: Install hatch + run: python -m pip install --upgrade pip hatch hatch-vcs + - name: Run tests + run: hatch run +py=${{ matrix.python }} test:default --color=yes pre-commit: runs-on: ubuntu-latest diff --git a/pyproject.toml b/pyproject.toml index 6eee6ef..0e846fb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ dependencies = [ "pytest" ] [tool.hatch.envs.test.scripts] -default = "pytest" +default = "pytest {args}" [[tool.hatch.envs.test.matrix]] python = ["3.7", "3.8", "3.9", "3.10", "3.11"] From 978096f0b51da8c38e2e94ef4586b4a2323db0be Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Thu, 9 Mar 2023 14:20:08 +0100 Subject: [PATCH 03/11] Use `pypa/gh-action-pypi-publish@release/v1` @ GHA `master` has been sunset quite a while ago and points to a historic version. To use the latest stable release of this action, it should be `release/v1`. The TestPyPI upload uses the right step, but the PyPI one doesn't. This patch corrects that. --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a4451cd..2be19c8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -50,7 +50,7 @@ jobs: - name: Publish package to PyPI if: github.event.action == 'published' - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ password: ${{ secrets.pypi_password }} From 4a53042252a109bcdd64422058de91c5dffff763 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 1 Sep 2023 09:36:38 +0300 Subject: [PATCH 04/11] Add support for Python 3.12 --- .github/workflows/main.yml | 5 +++-- pyproject.toml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f9f127..02b32e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: build -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - python: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, windows-latest] steps: @@ -19,6 +19,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} + allow-prereleases: true - name: Install hatch run: python -m pip install --upgrade pip hatch hatch-vcs - name: Run tests diff --git a/pyproject.toml b/pyproject.toml index 0e846fb..b1622e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Software Development :: Libraries", "Topic :: Utilities", ] @@ -58,7 +59,7 @@ dependencies = [ default = "pytest {args}" [[tool.hatch.envs.test.matrix]] -python = ["3.7", "3.8", "3.9", "3.10", "3.11"] +python = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] [tool.setuptools_scm] From 58b22b2d672564ff1925df51f4a8e07486765ed2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 1 Sep 2023 09:41:31 +0300 Subject: [PATCH 05/11] Drop support for EOL Python 3.7 --- .github/workflows/main.yml | 2 +- .pre-commit-config.yaml | 2 +- pyproject.toml | 5 ++--- src/iniconfig/__init__.py | 2 +- src/iniconfig/exceptions.py | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02b32e4..299bac3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, windows-latest] steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 09cb80b..20e04ba 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ repos: rev: v3.3.1 hooks: - id: pyupgrade - args: [--py37-plus] + args: [--py38-plus] - repo: https://github.com/tox-dev/pyproject-fmt rev: "0.4.1" hooks: diff --git a/pyproject.toml b/pyproject.toml index b1622e8..99cd6c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ authors = [ { name = "Ronny Pfannschmidt", email = "opensource@ronnypfannschmidt.de" }, { name = "Holger Krekel", email = "holger.krekel@gmail.com" }, ] -requires-python = ">=3.7" +requires-python = ">=3.8" dynamic = [ "version", ] @@ -27,7 +27,6 @@ classifiers = [ "Operating System :: POSIX", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -59,7 +58,7 @@ dependencies = [ default = "pytest {args}" [[tool.hatch.envs.test.matrix]] -python = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] +python = ["3.8", "3.9", "3.10", "3.11", "3.12"] [tool.setuptools_scm] diff --git a/src/iniconfig/__init__.py b/src/iniconfig/__init__.py index c18a8e4..3c40bc9 100644 --- a/src/iniconfig/__init__.py +++ b/src/iniconfig/__init__.py @@ -20,7 +20,7 @@ import os if TYPE_CHECKING: - from typing_extensions import Final + from typing import Final __all__ = ["IniConfig", "ParseError", "COMMENTCHARS", "iscommentline"] diff --git a/src/iniconfig/exceptions.py b/src/iniconfig/exceptions.py index bc898e6..8c4dc9a 100644 --- a/src/iniconfig/exceptions.py +++ b/src/iniconfig/exceptions.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from typing_extensions import Final + from typing import Final class ParseError(Exception): From 8c4bb5bf57dde613c8cdcf0e02a09b2fff630907 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 1 Sep 2023 09:43:14 +0300 Subject: [PATCH 06/11] Set python-version for pre-commit to remove CI warning --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 299bac3..6e2c6af 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,4 +30,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 + with: + python-version: 3.x - uses: pre-commit/action@v3.0.0 From 2eb8abfd9d3843100d7f138efe5bcd989a885024 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:09:14 +0300 Subject: [PATCH 07/11] Bump GitHub Actions --- .github/workflows/deploy.yml | 6 +++--- .github/workflows/main.yml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2be19c8..b6942e9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: deploy-${{ hashFiles('**/pyproject.toml') }} @@ -27,7 +27,7 @@ jobs: deploy- - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.x" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e2c6af..f3854e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,9 +14,9 @@ jobs: os: [ubuntu-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} allow-prereleases: true @@ -28,8 +28,8 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: 3.x - - uses: pre-commit/action@v3.0.0 + - uses: pre-commit/action@v3.0.1 From 3dc2b2d6bf03e4b7cc92949a8ef0983fdd7ee442 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:10:26 +0300 Subject: [PATCH 08/11] Add support for Python 3.13 --- .github/workflows/main.yml | 2 +- pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3854e3..f491e17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - python: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] os: [ubuntu-latest, windows-latest] steps: diff --git a/pyproject.toml b/pyproject.toml index 99cd6c0..74905b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Software Development :: Libraries", "Topic :: Utilities", ] @@ -58,7 +59,7 @@ dependencies = [ default = "pytest {args}" [[tool.hatch.envs.test.matrix]] -python = ["3.8", "3.9", "3.10", "3.11", "3.12"] +python = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] [tool.setuptools_scm] From 0bb99ad0f7a6b21d5eb24214a260132317a11e43 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Wed, 19 Mar 2025 18:21:53 +0100 Subject: [PATCH 09/11] fix #62: require a minimal hatch version with correct metadata --- CHANGELOG | 8 +++++++- pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5b7570a..00d5ba8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,10 @@ -2.0.0 +2.1.0 +===== + +* fix artifact building - pin minimal version of hatch + + +2.0.0 ====== * add support for Python 3.7-3.11 diff --git a/pyproject.toml b/pyproject.toml index 74905b9..0af633e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ build-backend = "hatchling.build" requires = [ "hatch-vcs", - "hatchling", + "hatchling>=1.26.0", ] [project] From 136435d0a4345bb048dca98e7c2f4e938d74521b Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Wed, 19 Mar 2025 18:27:12 +0100 Subject: [PATCH 10/11] update changelog --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 00d5ba8..cc3a51a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,7 +2,8 @@ ===== * fix artifact building - pin minimal version of hatch - +* drop eol python 3.8 +* add python 3.12 and 3.13 2.0.0 ====== From 34793a6417e35e511d0c17ffdd8a02ade0f9568e Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Wed, 19 Mar 2025 18:28:27 +0100 Subject: [PATCH 11/11] pre-commit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0af633e..78dcdc8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ build-backend = "hatchling.build" requires = [ "hatch-vcs", - "hatchling>=1.26.0", + "hatchling>=1.26", ] [project]