From 5b207a33c24209de28f28368c370502ebc940d4b Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 10 Jun 2021 10:03:29 -0700
Subject: [PATCH] add type deps

---
 certbot/setup.py             |  7 +++++++
 tools/pinning/pyproject.toml |  6 ------
 tools/requirements.txt       | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/certbot/setup.py b/certbot/setup.py
index 99c92a0b8..c2cf298fe 100644
--- a/certbot/setup.py
+++ b/certbot/setup.py
@@ -94,6 +94,13 @@ test_extras = [
     'pytest',
     'pytest-cov',
     'pytest-xdist',
+    'types-mock',
+    'types-openssl-python',
+    'types-pkg_resources',
+    'types-pyRFC3339',
+    'types-python-dateutil',
+    'types-pytz',
+    'types-requests',
     # typing-extensions is required to import typing.Protocol and make the mypy checks
     # pass (along with pylint about non-existent objects) on Python 3.6 & 3.7
     'typing-extensions',
diff --git a/tools/pinning/pyproject.toml b/tools/pinning/pyproject.toml
index 580922c4e..a9eed495a 100644
--- a/tools/pinning/pyproject.toml
+++ b/tools/pinning/pyproject.toml
@@ -51,12 +51,6 @@ awscli = ">=1.19.62"
 # as a dependency here to ensure a version of cython is pinned for extra
 # stability.
 cython = "*"
-# mypy 0.900 stopped including stubs containing type information for 3rd party
-# libraries by default. This breaks our tests so let's continue to pin it back
-# for now. See
-# https://mypy-lang.blogspot.com/2021/05/the-upcoming-switch-to-modular-typeshed.html
-# for more info.
-mypy = "<0.900"
 # We install mock in our "external-mock" tox environment to test that we didn't
 # break Certbot's test API which used to always use mock objects from the 3rd
 # party mock library. We list the mock dependency here so that is pinned, but
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 7190c9c81..b54e85d04 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -91,7 +91,7 @@ mock==4.0.3; python_version >= "3.6"
 msgpack==1.0.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.4.0"
 msrest==0.6.21; python_version >= "3.6"
 mypy-extensions==0.4.3; python_version >= "3.6"
-mypy==0.812; python_version >= "3.5"
+mypy==0.902; python_version >= "3.6"
 oauth2client==4.1.3; python_version >= "3.6"
 oauthlib==3.1.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.4.0"
 packaging==20.9; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.4.0" or python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.4.0" or python_version >= "3.6" and python_full_version >= "3.5.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
@@ -170,7 +170,17 @@ tox==3.23.1; python_version >= "3.6" and python_full_version < "3.0.0" or python
 tqdm==4.61.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.4.0"
 traitlets==4.3.3
 twine==3.3.0; python_version >= "3.6"
-typed-ast==1.4.3; python_version >= "3.6" or implementation_name == "cpython" and python_version < "3.8" and python_version >= "3.6"
+typed-ast==1.4.3; python_version >= "3.6" and python_version < "3.8" or implementation_name == "cpython" and python_version < "3.8" and python_version >= "3.6"
+types-cryptography==0.1.2; python_version >= "3.6"
+types-enum34==0.1.5; python_version >= "3.6"
+types-ipaddress==0.1.2; python_version >= "3.6"
+types-mock==0.1.1; python_version >= "3.6"
+types-openssl-python==0.1.2; python_version >= "3.6"
+types-pkg-resources==0.1.2; python_version >= "3.6"
+types-pyrfc3339==0.1.0; python_version >= "3.6"
+types-python-dateutil==0.1.2; python_version >= "3.6"
+types-pytz==0.1.0; python_version >= "3.6"
+types-requests==0.1.9; python_version >= "3.6"
 typing-extensions==3.10.0.0; python_version >= "3.6"
 uritemplate==3.0.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
 urllib3==1.26.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6"