Merge branch '8.0.x' into shell-completion-option-values

.github/dependabot.yml

@@ -2,7 +2,7 @@ version: 2
 updates:
 - package-ecosystem: "pip"
   directory: "/requirements"
-  target-branch: "3.0.x"
+  target-branch: "8.0.x"
   versioning-strategy: "lockfile-only"
   schedule:
     interval: "monthly"

.pre-commit-config.yaml

@@ -1,8 +1,9 @@
 ci:
+  autoupdate_branch: "8.0.x"
   autoupdate_schedule: monthly
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.1
+    rev: v2.31.0
     hooks:
       - id: pyupgrade
         args: ["--py36-plus"]

CHANGES.rst

@@ -14,6 +14,7 @@ Unreleased
 -   Fix a typo in the Bash completion script that affected file and
     directory completion. If this script was generated by a previous
     version, it should be regenerated. :issue:`2163`
+-   Fix typing for ``secho`` file argument. :issue:`2174`
 -   Fix shell completion for option values that start with non-
     alphanumeric characters. :issue:`2040`
 

requirements/dev.txt

@@ -6,17 +6,15 @@
 #
 alabaster==0.7.12
     # via sphinx
-attrs==21.2.0
+attrs==21.4.0
     # via pytest
 babel==2.9.1
     # via sphinx
-backports.entry-points-selectable==1.1.1
-    # via virtualenv
 certifi==2021.10.8
     # via requests
 cfgv==3.3.1
     # via pre-commit
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
     # via requests
 click==8.0.3
     # via pip-tools
@@ -30,7 +28,7 @@ filelock==3.4.2
     # via
     #   tox
     #   virtualenv
-identify==2.4.0
+identify==2.4.3
     # via pre-commit
 idna==3.3
     # via requests
@@ -42,7 +40,7 @@ jinja2==3.0.3
     # via sphinx
 markupsafe==2.0.1
     # via jinja2
-mypy==0.930
+mypy==0.931
     # via -r requirements/typing.in
 mypy-extensions==0.4.3
     # via mypy
@@ -72,7 +70,7 @@ py==1.11.0
     # via
     #   pytest
     #   tox
-pygments==2.10.0
+pygments==2.11.2
     # via
     #   sphinx
     #   sphinx-tabs
@@ -84,7 +82,7 @@ pytz==2021.3
     # via babel
 pyyaml==6.0
     # via pre-commit
-requests==2.26.0
+requests==2.27.1
     # via sphinx
 six==1.16.0
     # via
@@ -99,7 +97,7 @@ sphinx==4.3.2
     #   sphinx-issues
     #   sphinx-tabs
     #   sphinxcontrib-log-cabinet
-sphinx-issues==1.2.0
+sphinx-issues==3.0.1
     # via -r requirements/docs.in
 sphinx-tabs==3.2.0
     # via -r requirements/docs.in
@@ -126,13 +124,13 @@ tomli==2.0.0
     # via
     #   mypy
     #   pep517
-tox==3.24.4
+tox==3.24.5
     # via -r requirements/dev.in
 typing-extensions==4.0.1
     # via mypy
-urllib3==1.26.7
+urllib3==1.26.8
     # via requests
-virtualenv==20.10.0
+virtualenv==20.13.0
     # via
     #   pre-commit
     #   tox

requirements/docs.txt

@@ -10,7 +10,7 @@ babel==2.9.1
     # via sphinx
 certifi==2021.10.8
     # via requests
-charset-normalizer==2.0.9
+charset-normalizer==2.0.10
     # via requests
 docutils==0.16
     # via
@@ -30,15 +30,15 @@ packaging==21.3
     #   sphinx
 pallets-sphinx-themes==2.0.2
     # via -r requirements/docs.in
-pygments==2.10.0
+pygments==2.11.2
     # via
     #   sphinx
     #   sphinx-tabs
 pyparsing==3.0.6
     # via packaging
 pytz==2021.3
     # via babel
-requests==2.26.0
+requests==2.27.1
     # via sphinx
 snowballstemmer==2.2.0
     # via sphinx
@@ -49,7 +49,7 @@ sphinx==4.3.2
     #   sphinx-issues
     #   sphinx-tabs
     #   sphinxcontrib-log-cabinet
-sphinx-issues==1.2.0
+sphinx-issues==3.0.1
     # via -r requirements/docs.in
 sphinx-tabs==3.2.0
     # via -r requirements/docs.in
@@ -67,7 +67,7 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-urllib3==1.26.7
+urllib3==1.26.8
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/tests.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements/tests.in
 #
-attrs==21.2.0
+attrs==21.4.0
     # via pytest
 iniconfig==1.1.1
     # via pytest

requirements/typing.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements/typing.in
 #
-mypy==0.930
+mypy==0.931
     # via -r requirements/typing.in
 mypy-extensions==0.4.3
     # via mypy

setup.cfg

@@ -29,7 +29,7 @@ classifiers =
 [options]
 packages = find:
 package_dir = = src
-include_package_data = true
+include_package_data = True
 python_requires = >= 3.6
 # Dependencies are in setup.py for GitHub's dependency graph.
 
@@ -42,22 +42,22 @@ filterwarnings =
     error
 
 [coverage:run]
-branch = true
+branch = True
 source =
     click
     tests
 
 [coverage:paths]
 source =
-    click
+    src
     */site-packages
 
 [flake8]
 # B = bugbear
 # E = pycodestyle errors
 # F = flake8 pyflakes
 # W = pycodestyle warnings
-# B9 = bugbear opinions,
+# B9 = bugbear opinions
 # ISC = implicit str concat
 select = B, E, F, W, B9, ISC
 ignore =
@@ -72,7 +72,7 @@ ignore =
 # up to 88 allowed by bugbear B950
 max-line-length = 80
 per-file-ignores =
-    # __init__ module exports names
+    # __init__ exports names
     src/click/__init__.py: F401
 
 [mypy]

src/click/termui.py

@@ -624,7 +624,7 @@ def unstyle(text: str) -> str:
 
 def secho(
     message: t.Optional[t.Any] = None,
-    file: t.Optional[t.IO] = None,
+    file: t.Optional[t.IO[t.AnyStr]] = None,
     nl: bool = True,
     err: bool = False,
     color: t.Optional[bool] = None,

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py3{11,10,9,8,7,6},pypy37
+    py3{11,10,9,8,7,6},pypy3{8,7}
     style
     typing
     docs