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: diff --git a/pyproject.toml b/pyproject.toml index 46b0c3dcb6..fc6173a4eb 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" }, ] @@ -17,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", @@ -65,9 +65,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*" ] 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