From a5734e497dbc67d8032a18ba70fb74583aa1eb13 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 12 Oct 2021 09:52:56 -0400
Subject: [PATCH 1/2] Rev Python tooling to latest mypy release.

---
 lib/galaxy/dependencies/lint-requirements.txt | 13 +++++++-
 .../dependencies/pinned-lint-requirements.txt | 32 +++++++++++++------
 lib/galaxy/util/__init__.py                   |  4 +--
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/lib/galaxy/dependencies/lint-requirements.txt b/lib/galaxy/dependencies/lint-requirements.txt
index ddf5da72ada..a722ab67ef3 100644
--- a/lib/galaxy/dependencies/lint-requirements.txt
+++ b/lib/galaxy/dependencies/lint-requirements.txt
@@ -1,4 +1,15 @@
 flake8
 flake8-bugbear
 flake8-import-order
-mypy==0.812
+mypy==0.910
+types-python-dateutil
+types-pkg-resources
+types-boto
+types-PyYAML
+types-requests
+types-docutils
+types-bleach
+types-six
+types-paramiko
+types-Markdown
+types-contextvars
diff --git a/lib/galaxy/dependencies/pinned-lint-requirements.txt b/lib/galaxy/dependencies/pinned-lint-requirements.txt
index 0309b42bc0c..6d2eadef291 100644
--- a/lib/galaxy/dependencies/pinned-lint-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-lint-requirements.txt
@@ -1,13 +1,25 @@
-attrs==20.3.0
-flake8==3.9.1
-flake8-bugbear==21.4.3
+attrs==21.2.0
+flake8==4.0.1
+flake8-bugbear==21.9.2
 flake8-import-order==0.18.1
-importlib-metadata==4.0.1
 mccabe==0.6.1
-mypy==0.812
+mypy==0.910
 mypy-extensions==0.4.3
-pycodestyle==2.7.0
-pyflakes==2.3.1
-typed-ast==1.4.3
-typing-extensions==3.7.4.3
-zipp==3.4.1
+pycodestyle==2.8.0
+pyflakes==2.4.0
+toml==0.10.2
+types-bleach==4.1.1
+types-boto==2.49.1
+types-contextvars==2.4.0
+types-cryptography==3.3.6
+types-docutils==0.17.1
+types-enum34==1.1.1
+types-ipaddress==1.0.1
+types-Markdown==3.3.5
+types-paramiko==2.7.2
+types-pkg-resources==0.1.3
+types-python-dateutil==2.8.1
+types-PyYAML==5.4.11
+types-requests==2.25.10
+types-six==1.16.2
+typing-extensions==3.10.0.2
diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
index c1de7a1ca31..5c0f65b8a72 100644
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -61,8 +61,8 @@ try:
     import docutils.core as docutils_core
     import docutils.writers.html4css1 as docutils_html4css1
 except ImportError:
-    docutils_core = None
-    docutils_html4css1 = None
+    docutils_core = None  # type: ignore
+    docutils_html4css1 = None  # type: ignore
 
 try:
     import uwsgi

From 9ec4e05eddc0a41ac9c59945698bd59aa13a58b9 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@gmail.com>
Date: Wed, 13 Oct 2021 00:37:17 +0100
Subject: [PATCH 2/2] Sort lint requirements

---
 lib/galaxy/dependencies/lint-requirements.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/galaxy/dependencies/lint-requirements.txt b/lib/galaxy/dependencies/lint-requirements.txt
index a722ab67ef3..9e9a1b061ea 100644
--- a/lib/galaxy/dependencies/lint-requirements.txt
+++ b/lib/galaxy/dependencies/lint-requirements.txt
@@ -2,14 +2,14 @@ flake8
 flake8-bugbear
 flake8-import-order
 mypy==0.910
-types-python-dateutil
-types-pkg-resources
+types-bleach
 types-boto
+types-contextvars
+types-docutils
+types-Markdown
+types-paramiko
+types-pkg-resources
+types-python-dateutil
 types-PyYAML
 types-requests
-types-docutils
-types-bleach
 types-six
-types-paramiko
-types-Markdown
-types-contextvars