summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2021-12-26 15:04:06 -0700
committerGitHub <noreply@github.com>2021-12-26 15:04:06 -0700
commite3388809b1ccc34984d229a7e63e2257aef70fcf (patch)
tree04393aafbfd1f9a81a11809600a957177f0bcbc9
parentdf6b72d3e079a8bf1f8455486cf7ac6663ea1916 (diff)
parent2814073e04e7811ce0f4cf70d7b23073e876fc72 (diff)
downloadclick-e3388809b1ccc34984d229a7e63e2257aef70fcf.tar.gz
Merge pull request #2160 from pallets/update-requirements
update requirements
-rw-r--r--.pre-commit-config.yaml6
-rw-r--r--requirements/dev.txt41
-rw-r--r--requirements/docs.txt16
-rw-r--r--requirements/tests.txt4
-rw-r--r--requirements/typing.txt6
-rw-r--r--setup.cfg1
-rw-r--r--src/click/_compat.py1
-rw-r--r--src/click/_termui_impl.py1
-rw-r--r--src/click/core.py2
-rw-r--r--src/click/termui.py2
-rw-r--r--src/click/testing.py8
11 files changed, 43 insertions, 45 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4bf99c6..eb55351 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ ci:
autoupdate_schedule: monthly
repos:
- repo: https://github.com/asottile/pyupgrade
- rev: v2.29.0
+ rev: v2.29.1
hooks:
- id: pyupgrade
args: ["--py36-plus"]
@@ -12,7 +12,7 @@ repos:
- id: reorder-python-imports
args: ["--application-directories", "src"]
- repo: https://github.com/psf/black
- rev: 21.10b0
+ rev: 21.12b0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
@@ -23,7 +23,7 @@ repos:
- flake8-bugbear
- flake8-implicit-str-concat
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.0.1
+ rev: v4.1.0
hooks:
- id: fix-byte-order-marker
- id: trailing-whitespace
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 9fafe31..6dbcdf0 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -10,63 +10,63 @@ attrs==21.2.0
# via pytest
babel==2.9.1
# via sphinx
-backports.entry-points-selectable==1.1.0
+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.7
+charset-normalizer==2.0.9
# via requests
click==8.0.3
# via pip-tools
-distlib==0.3.3
+distlib==0.3.4
# via virtualenv
docutils==0.16
# via
# sphinx
# sphinx-tabs
-filelock==3.3.2
+filelock==3.4.2
# via
# tox
# virtualenv
-identify==2.3.3
+identify==2.4.0
# via pre-commit
idna==3.3
# via requests
-imagesize==1.2.0
+imagesize==1.3.0
# via sphinx
iniconfig==1.1.1
# via pytest
-jinja2==3.0.2
+jinja2==3.0.3
# via sphinx
markupsafe==2.0.1
# via jinja2
-mypy==0.910
+mypy==0.930
# via -r requirements/typing.in
mypy-extensions==0.4.3
# via mypy
nodeenv==1.6.0
# via pre-commit
-packaging==21.2
+packaging==21.3
# via
# pallets-sphinx-themes
# pytest
# sphinx
# tox
-pallets-sphinx-themes==2.0.1
+pallets-sphinx-themes==2.0.2
# via -r requirements/docs.in
pep517==0.12.0
# via pip-tools
pip-tools==6.4.0
# via -r requirements/dev.in
-platformdirs==2.4.0
+platformdirs==2.4.1
# via virtualenv
pluggy==1.0.0
# via
# pytest
# tox
-pre-commit==2.15.0
+pre-commit==2.16.0
# via -r requirements/dev.in
py==1.11.0
# via
@@ -76,7 +76,7 @@ pygments==2.10.0
# via
# sphinx
# sphinx-tabs
-pyparsing==2.4.7
+pyparsing==3.0.6
# via packaging
pytest==6.2.5
# via -r requirements/tests.in
@@ -90,9 +90,9 @@ six==1.16.0
# via
# tox
# virtualenv
-snowballstemmer==2.1.0
+snowballstemmer==2.2.0
# via sphinx
-sphinx==4.2.0
+sphinx==4.3.2
# via
# -r requirements/docs.in
# pallets-sphinx-themes
@@ -119,15 +119,16 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
toml==0.10.2
# via
- # mypy
# pre-commit
# pytest
# tox
-tomli==1.2.2
- # via pep517
+tomli==2.0.0
+ # via
+ # mypy
+ # pep517
tox==3.24.4
# via -r requirements/dev.in
-typing-extensions==3.10.0.2
+typing-extensions==4.0.1
# via mypy
urllib3==1.26.7
# via requests
@@ -135,7 +136,7 @@ virtualenv==20.10.0
# via
# pre-commit
# tox
-wheel==0.37.0
+wheel==0.37.1
# via pip-tools
# The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 8f5fd06..1b51a42 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -10,7 +10,7 @@ babel==2.9.1
# via sphinx
certifi==2021.10.8
# via requests
-charset-normalizer==2.0.7
+charset-normalizer==2.0.9
# via requests
docutils==0.16
# via
@@ -18,31 +18,31 @@ docutils==0.16
# sphinx-tabs
idna==3.3
# via requests
-imagesize==1.2.0
+imagesize==1.3.0
# via sphinx
-jinja2==3.0.2
+jinja2==3.0.3
# via sphinx
markupsafe==2.0.1
# via jinja2
-packaging==21.2
+packaging==21.3
# via
# pallets-sphinx-themes
# sphinx
-pallets-sphinx-themes==2.0.1
+pallets-sphinx-themes==2.0.2
# via -r requirements/docs.in
pygments==2.10.0
# via
# sphinx
# sphinx-tabs
-pyparsing==2.4.7
+pyparsing==3.0.6
# via packaging
pytz==2021.3
# via babel
requests==2.26.0
# via sphinx
-snowballstemmer==2.1.0
+snowballstemmer==2.2.0
# via sphinx
-sphinx==4.2.0
+sphinx==4.3.2
# via
# -r requirements/docs.in
# pallets-sphinx-themes
diff --git a/requirements/tests.txt b/requirements/tests.txt
index 02dd8e8..c272b15 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -8,13 +8,13 @@ attrs==21.2.0
# via pytest
iniconfig==1.1.1
# via pytest
-packaging==21.2
+packaging==21.3
# via pytest
pluggy==1.0.0
# via pytest
py==1.11.0
# via pytest
-pyparsing==2.4.7
+pyparsing==3.0.6
# via packaging
pytest==6.2.5
# via -r requirements/tests.in
diff --git a/requirements/typing.txt b/requirements/typing.txt
index 7a3e613..a674922 100644
--- a/requirements/typing.txt
+++ b/requirements/typing.txt
@@ -4,11 +4,11 @@
#
# pip-compile requirements/typing.in
#
-mypy==0.910
+mypy==0.930
# via -r requirements/typing.in
mypy-extensions==0.4.3
# via mypy
-toml==0.10.2
+tomli==2.0.0
# via mypy
-typing-extensions==3.10.0.2
+typing-extensions==4.0.1
# via mypy
diff --git a/setup.cfg b/setup.cfg
index 45c6b89..06474f8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -78,6 +78,7 @@ per-file-ignores =
[mypy]
files = src/click
python_version = 3.6
+show_error_codes = True
disallow_subclassing_any = True
disallow_untyped_calls = True
disallow_untyped_defs = True
diff --git a/src/click/_compat.py b/src/click/_compat.py
index 7154dfd..766d286 100644
--- a/src/click/_compat.py
+++ b/src/click/_compat.py
@@ -561,7 +561,6 @@ if sys.platform.startswith("win") and WIN:
return rv
-
else:
def _get_argv_encoding() -> str:
diff --git a/src/click/_termui_impl.py b/src/click/_termui_impl.py
index 39c1d08..4b979bc 100644
--- a/src/click/_termui_impl.py
+++ b/src/click/_termui_impl.py
@@ -675,7 +675,6 @@ if WIN:
_translate_ch_to_exc(rv)
return rv
-
else:
import tty
import termios
diff --git a/src/click/core.py b/src/click/core.py
index f226354..8f539aa 100644
--- a/src/click/core.py
+++ b/src/click/core.py
@@ -2472,7 +2472,7 @@ class Option(Parameter):
elif prompt is False:
prompt_text = None
else:
- prompt_text = t.cast(str, prompt)
+ prompt_text = prompt
self.prompt = prompt_text
self.confirmation_prompt = confirmation_prompt
diff --git a/src/click/termui.py b/src/click/termui.py
index cf8d5f1..5dc4ba0 100644
--- a/src/click/termui.py
+++ b/src/click/termui.py
@@ -160,7 +160,6 @@ def prompt(
if confirmation_prompt is True:
confirmation_prompt = _("Repeat for confirmation")
- confirmation_prompt = t.cast(str, confirmation_prompt)
confirmation_prompt = _build_prompt(confirmation_prompt, prompt_suffix)
while True:
@@ -182,7 +181,6 @@ def prompt(
if not confirmation_prompt:
return result
while True:
- confirmation_prompt = t.cast(str, confirmation_prompt)
value2 = prompt_func(confirmation_prompt)
if value2:
break
diff --git a/src/click/testing.py b/src/click/testing.py
index d19b850..e395c2e 100644
--- a/src/click/testing.py
+++ b/src/click/testing.py
@@ -464,16 +464,16 @@ class CliRunner:
Added the ``temp_dir`` parameter.
"""
cwd = os.getcwd()
- t = tempfile.mkdtemp(dir=temp_dir)
- os.chdir(t)
+ dt = tempfile.mkdtemp(dir=temp_dir) # type: ignore[type-var]
+ os.chdir(dt)
try:
- yield t
+ yield t.cast(str, dt)
finally:
os.chdir(cwd)
if temp_dir is None:
try:
- shutil.rmtree(t)
+ shutil.rmtree(dt)
except OSError: # noqa: B014
pass