From e31895415e1731e8ea2cd97ec177a12d3e6854d8 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Tue, 18 Mar 2025 18:07:54 -0400 Subject: [PATCH 1/7] GH Actions: Add pypy3.11 to testing matrix idea by @cclauss Co-authored-by: Christian Clauss --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 84041820a3..d238a821e6 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -271,7 +271,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["pypy-3.9", "pypy-3.10"] + python-version: ["pypy-3.9", "pypy-3.10", "pypy-3.11"] steps: - name: Check out code from GitHub uses: actions/checkout@v4.2.2 From f29ca584592a3c001e77ee55700a8bb953cf977f Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 24 Mar 2025 13:00:37 +0100 Subject: [PATCH 2/7] Pre-commit not working on merge commit ? Co-authored-by: Christian Clauss --- .github/workflows/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 99d3b0ab0d..ac43a2daa5 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -40,7 +40,7 @@ jobs: - os: ubuntu-latest python-version: "pypy-3.10" - os: ubuntu-latest - python-version: "pypy-3.11" + python-version: "pypy-3.11" runs-on: ${{ matrix.os }} outputs: python-key: ${{ steps.generate-python-key.outputs.key }} @@ -227,4 +227,4 @@ jobs: run: | . venv\\Scripts\\activate pip list | grep 'astroid\|pylint' - python -m pytest --durations=10 --benchmark-disable tests/ \ No newline at end of file + python -m pytest --durations=10 --benchmark-disable tests/ From bf5125d17662fb3e857d909358d3697c53c7cff5 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 24 Mar 2025 17:25:59 +0100 Subject: [PATCH 3/7] Add fragments --- doc/whatsnew/fragments/10287.feature | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/whatsnew/fragments/10287.feature diff --git a/doc/whatsnew/fragments/10287.feature b/doc/whatsnew/fragments/10287.feature new file mode 100644 index 0000000000..b51187d941 --- /dev/null +++ b/doc/whatsnew/fragments/10287.feature @@ -0,0 +1,3 @@ +pypy 3.11 is now officially supported. + + Refs #10287 \ No newline at end of file From a7d11c081472f4b8760f440f4af88a2922b566fc Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 24 Mar 2025 17:26:28 +0100 Subject: [PATCH 4/7] Update doc/whatsnew/fragments/10287.feature --- doc/whatsnew/fragments/10287.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/whatsnew/fragments/10287.feature b/doc/whatsnew/fragments/10287.feature index b51187d941..241ae1e2f0 100644 --- a/doc/whatsnew/fragments/10287.feature +++ b/doc/whatsnew/fragments/10287.feature @@ -1,3 +1,3 @@ pypy 3.11 is now officially supported. - Refs #10287 \ No newline at end of file + Refs #10287 From 15e638e6cb96f1c6d3a9e614c6401fe08ac5d333 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 24 Mar 2025 18:57:18 +0100 Subject: [PATCH 5/7] Update doc/whatsnew/fragments/10287.feature --- doc/whatsnew/fragments/10287.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/whatsnew/fragments/10287.feature b/doc/whatsnew/fragments/10287.feature index 241ae1e2f0..268c874c8c 100644 --- a/doc/whatsnew/fragments/10287.feature +++ b/doc/whatsnew/fragments/10287.feature @@ -1,3 +1,3 @@ pypy 3.11 is now officially supported. - Refs #10287 +Refs #10287 From ace1562ac08d497fc2918ff38948b0a142dd4374 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Mon, 24 Mar 2025 21:13:31 +0100 Subject: [PATCH 6/7] [packaging] Fix the setuptools issue with multiple definitions for LICENSE --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fc6173a4eb..caa2123cf0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,8 +8,7 @@ name = "pylint" description = "python code static checker" readme = "README.rst" keywords = [ "lint", "linter", "python", "static code analysis" ] -license = "GPL-2.0-or-later" -license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] +license = { text = "GPL-2.0-or-later" } authors = [ { name = "Python Code Quality Authority", email = "code-quality@python.org" }, ] From 181178392c4418585750b138b09d9fd0d5861296 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Tue, 25 Mar 2025 10:33:01 +0100 Subject: [PATCH 7/7] revert unwanted changes --- doc/whatsnew/fragments/10287.feature | 6 +++--- pyproject.toml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/whatsnew/fragments/10287.feature b/doc/whatsnew/fragments/10287.feature index 268c874c8c..d71591398c 100644 --- a/doc/whatsnew/fragments/10287.feature +++ b/doc/whatsnew/fragments/10287.feature @@ -1,3 +1,3 @@ -pypy 3.11 is now officially supported. - -Refs #10287 +pypy 3.11 is now officially supported. + +Refs #10287 diff --git a/pyproject.toml b/pyproject.toml index 2f4e82a518..13edbb5d70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,8 @@ name = "pylint" description = "python code static checker" readme = "README.rst" keywords = [ "lint", "linter", "python", "static code analysis" ] -license = { text = "GPL-2.0-or-later" } +license = "GPL-2.0-or-later" +license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] authors = [ { name = "Python Code Quality Authority", email = "code-quality@python.org" }, ]