diff options
author | David Lord <davidism@gmail.com> | 2023-01-19 16:45:52 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-19 16:45:52 -0800 |
commit | 347529dde549e5c832aefce799ccee2fd5667944 (patch) | |
tree | 9d8e4e3bfe046205496b1d6c16540a2c95222a70 | |
parent | cba52fa76135af2edf46c154203b47106f898eb3 (diff) | |
parent | 742a5521c4e219c8413a9a0478f752b54ad6d9ea (diff) | |
download | click-347529dde549e5c832aefce799ccee2fd5667944.tar.gz |
switch to pyproject.toml (#2438)
-rw-r--r-- | .flake8 | 25 | ||||
-rw-r--r-- | .github/workflows/tests.yaml | 2 | ||||
-rw-r--r-- | CHANGES.rst | 3 | ||||
-rw-r--r-- | pyproject.toml | 63 | ||||
-rw-r--r-- | setup.cfg | 107 | ||||
-rw-r--r-- | setup.py | 9 | ||||
-rw-r--r-- | tests/test_utils.py | 2 |
7 files changed, 93 insertions, 118 deletions
@@ -0,0 +1,25 @@ +[flake8] +extend-select = + # bugbear + B + # bugbear opinions + B9 + # implicit str concat + ISC +extend-ignore = + # slice notation whitespace, invalid + E203 + # line length, handled by bugbear B950 + E501 + # bare except, handled by bugbear B001 + E722 + # zip with strict=, requires python >= 3.10 + B905 + # string formatting opinion, B028 renamed to B907 + B028 + B907 +# up to 88 allowed by bugbear B950 +max-line-length = 80 +per-file-ignores = + # __init__ exports names + src/click/__init__.py: F401 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b757fa0..85e748b 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -50,7 +50,7 @@ jobs: uses: actions/cache@v3 with: path: ./.mypy_cache - key: mypy|${{ matrix.python }}|${{ hashFiles('setup.cfg') }} + key: mypy|${{ matrix.python }}|${{ hashFiles('pyproject.toml') }} if: matrix.tox == 'typing' - run: pip install tox - run: tox run -e ${{ matrix.tox }} diff --git a/CHANGES.rst b/CHANGES.rst index fcc1ea1..39ad6ee 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Version 8.2.0 Unreleased +- Use modern packaging metadata with ``pyproject.toml`` instead of ``setup.cfg``. + :pr:`326` + Version 8.1.4 ------------- diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..36ed838 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,63 @@ +[project] +name = "click" +description = "Composable command line interface toolkit" +readme = "README.rst" +license = {text = "BSD-3-Clause"} +maintainers = [{name = "Pallets", email = "contact@palletsprojects.com"}] +authors = [{name = "Armin Ronacher", email = "armin.ronacher@active-4.com"}] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Operating System :: OS Independent", + "Programming Language :: Python", +] +requires-python = ">=3.7" +dependencies = [ + "colorama; platform_system == 'Windows'", + "importlib-metadata; python_version < '3.8'", +] +dynamic = ["version"] + +[project.urls] +Donate = "https://palletsprojects.com/donate" +Documentation = "https://click.palletsprojects.com/" +Changes = "https://click.palletsprojects.com/changes/" +"Source Code" = "https://github.com/pallets/click/" +"Issue Tracker" = "https://github.com/pallets/click/issues/" +Twitter = "https://twitter.com/PalletsTeam" +Chat = "https://discord.gg/pallets" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[tool.setuptools.dynamic] +version = {attr = "click.__version__"} + +[tool.pytest.ini_options] +testpaths = ["tests"] +filterwarnings = ["error"] + +[tool.coverage.run] +branch = true +source = ["click", "tests"] + +[tool.coverage.paths] +source = ["src", "*/site-packages"] + +[tool.mypy] +python_version = "3.7" +files = ["src/click"] +show_error_codes = true +pretty = true +strict = true +local_partial_types = true +warn_unreachable = true + +[[tool.mypy.overrides]] +module = [ + "colorama.*", + "importlib_metadata.*" +] +ignore_missing_imports = true diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 0d9b7ac..0000000 --- a/setup.cfg +++ /dev/null @@ -1,107 +0,0 @@ -[metadata] -name = click -version = attr: click.__version__ -url = https://palletsprojects.com/p/click/ -project_urls = - Donate = https://palletsprojects.com/donate - Documentation = https://click.palletsprojects.com/ - Changes = https://click.palletsprojects.com/changes/ - Source Code = https://github.com/pallets/click/ - Issue Tracker = https://github.com/pallets/click/issues/ - Twitter = https://twitter.com/PalletsTeam - Chat = https://discord.gg/pallets -license = BSD-3-Clause -license_files = LICENSE.rst -author = Armin Ronacher -author_email = armin.ronacher@active-4.com -maintainer = Pallets -maintainer_email = contact@palletsprojects.com -description = Composable command line interface toolkit -long_description = file: README.rst -long_description_content_type = text/x-rst -classifiers = - Development Status :: 5 - Production/Stable - Intended Audience :: Developers - License :: OSI Approved :: BSD License - Operating System :: OS Independent - Programming Language :: Python - -[options] -packages = find: -package_dir = = src -include_package_data = True -python_requires = >= 3.7 -# Dependencies are in setup.py for GitHub's dependency graph. - -[options.packages.find] -where = src - -[tool:pytest] -testpaths = tests -filterwarnings = - error - -[coverage:run] -branch = True -source = - click - tests - -[coverage:paths] -source = - src - */site-packages - -[flake8] -# B = bugbear -# E = pycodestyle errors -# F = flake8 pyflakes -# W = pycodestyle warnings -# B9 = bugbear opinions -# ISC = implicit str concat -select = B, E, F, W, B9, ISC -ignore = - # slice notation whitespace, invalid - E203 - # line length, handled by bugbear B950 - E501 - # bare except, handled by bugbear B001 - E722 - # bin op line break, invalid - W503 - # zip with strict=, requires python >= 3.10 - B905 - # string formatting opinion, B028 renamed to B907 - B028 - B907 -# up to 88 allowed by bugbear B950 -max-line-length = 80 -per-file-ignores = - # __init__ exports names - src/click/__init__.py: F401 - -[mypy] -files = src/click -python_version = 3.7 -show_error_codes = True -disallow_subclassing_any = True -disallow_untyped_calls = True -disallow_untyped_defs = True -disallow_incomplete_defs = True -disallow_any_generics = True -check_untyped_defs = True -no_implicit_optional = True -local_partial_types = True -no_implicit_reexport = True -strict_equality = True -warn_redundant_casts = True -warn_unused_configs = True -warn_unused_ignores = True -warn_return_any = True -warn_unreachable = True - -[mypy-colorama.*] -ignore_missing_imports = True - -[mypy-importlib_metadata.*] -ignore_missing_imports = True diff --git a/setup.py b/setup.py deleted file mode 100644 index 0a74d41..0000000 --- a/setup.py +++ /dev/null @@ -1,9 +0,0 @@ -from setuptools import setup - -setup( - name="click", - install_requires=[ - "colorama; platform_system == 'Windows'", - "importlib-metadata; python_version < '3.8'", - ], -) diff --git a/tests/test_utils.py b/tests/test_utils.py index 5dfeb02..8b24c67 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -457,7 +457,7 @@ def test_expand_args(monkeypatch): assert user in click.utils._expand_args(["~"]) monkeypatch.setenv("CLICK_TEST", "hello") assert "hello" in click.utils._expand_args(["$CLICK_TEST"]) - assert "setup.cfg" in click.utils._expand_args(["*.cfg"]) + assert "pyproject.toml" in click.utils._expand_args(["*.toml"]) assert os.path.join("docs", "conf.py") in click.utils._expand_args(["**/conf.py"]) assert "*.not-found" in click.utils._expand_args(["*.not-found"]) # a bad glob pattern, such as a pytest identifier, should return itself |