From 165a41f819ea461a75a4d2a049b10a00613d1b29 Mon Sep 17 00:00:00 2001 From: Wing Lian Date: Thu, 20 Mar 2025 00:53:00 -0400 Subject: [PATCH 1/7] move deprecated 'tool.setuptools.license-files' --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 46b0c3dcb6..f9c8c446ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,7 @@ description = "python code static checker" readme = "README.rst" keywords = [ "lint", "linter", "python", "static code analysis" ] license = { text = "GPL-2.0-or-later" } +license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] # Keep in sync with setup.cfg authors = [ { name = "Python Code Quality Authority", email = "code-quality@python.org" }, ] @@ -65,9 +66,6 @@ scripts.pylint-config = "pylint:_run_pylint_config" scripts.pyreverse = "pylint:run_pyreverse" scripts.symilar = "pylint:run_symilar" -[tool.setuptools] -license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] # Keep in sync with setup.cfg - [tool.setuptools.packages.find] include = [ "pylint*" ] From 4405bd2f1a311dfcce2c88da18eaec01f77c4045 Mon Sep 17 00:00:00 2001 From: Wing Lian Date: Thu, 20 Mar 2025 00:57:32 -0400 Subject: [PATCH 2/7] use license-files --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f9c8c446ee..ca48d1160b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,6 @@ 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-files = [ "LICENSE", "CONTRIBUTORS.txt" ] # Keep in sync with setup.cfg authors = [ { name = "Python Code Quality Authority", email = "code-quality@python.org" }, From 8d33c619e3e2f2c2bf6a35080df5ef10dd34d4d8 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Thu, 20 Mar 2025 09:03:44 +0100 Subject: [PATCH 3/7] Remove setup.cfg --- setup.cfg | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 3b35d7a5e9..0000000000 --- a/setup.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# Setuptools v62.6 doesn't support editable installs with just 'pyproject.toml' (PEP 660). -# Keep this file until it does! - -[metadata] -# wheel doesn't yet read license_files from pyproject.toml - tools.setuptools -# Keep it here until it does! -license_files = - LICENSE - CONTRIBUTORS.txt From 5d823fad26324d791db56b716363d677127d9422 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Thu, 20 Mar 2025 09:04:53 +0100 Subject: [PATCH 4/7] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ca48d1160b..fc9b896fc5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ name = "pylint" description = "python code static checker" readme = "README.rst" keywords = [ "lint", "linter", "python", "static code analysis" ] -license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] # Keep in sync with setup.cfg +license-files = [ "LICENSE", "CONTRIBUTORS.txt" ] authors = [ { name = "Python Code Quality Authority", email = "code-quality@python.org" }, ] From 74f4e43742356ccbce8420b88a56d805ed3ffb12 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Thu, 20 Mar 2025 09:08:32 +0100 Subject: [PATCH 5/7] Update pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index fc9b896fc5..16d555be01 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +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" ] authors = [ { name = "Python Code Quality Authority", email = "code-quality@python.org" }, From c21f48e8b460ec54afff91ff28b9c20c92dd8b7f Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Thu, 20 Mar 2025 09:10:05 +0100 Subject: [PATCH 6/7] Remove the metadata --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 16d555be01..fc6173a4eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,6 @@ classifiers = [ "Development Status :: 6 - Mature", "Environment :: Console", "Intended Audience :: Developers", - "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", From 5b64422879ad7580388db2285a03802560827490 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Thu, 20 Mar 2025 09:20:50 +0100 Subject: [PATCH 7/7] Remove pyroma --- .pre-commit-config.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 27abcfdec7..bc1277a142 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -156,20 +156,6 @@ repos: exclude: *fixtures args: ["--max-summary-lines=2", "--linewrap-full-docstring"] files: "pylint" - - repo: https://github.com/regebro/pyroma - rev: "4.2" - hooks: - - id: pyroma - # Must be specified because of the default value in pyroma - always_run: false - files: | - (?x)^( - README.rst| - pyproject.toml| - pylint/__init__.py| - pylint/__pkginfo__.py| - setup.cfg - )$ - repo: https://github.com/PyCQA/bandit rev: 1.8.3 hooks: