From f733cd19c2aea3c97a949e711578641b4d1cbe95 Mon Sep 17 00:00:00 2001
From: Avasam <samuel.06@hotmail.com>
Date: Tue, 27 Aug 2024 15:34:13 -0400
Subject: [PATCH] Pass mypy and link issues

---
 mypy.ini                | 14 ++++++++++++++
 pip_run/commands.py     |  2 +-
 pip_run/compat/py310.py | 10 ++++++----
 pip_run/compat/py38.py  | 12 ++++--------
 pip_run/read-deps.py    |  4 ++--
 pyproject.toml          |  5 +----
 6 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/mypy.ini b/mypy.ini
index efcb8cb..5424d0d 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -13,3 +13,17 @@ explicit_package_bases = True
 disable_error_code =
 	# Disable due to many false positives
 	overload-overlap,
+
+# jaraco/jaraco.env#2
+# jaraco/jaraco.env#3
+[mypy-jaraco.env]
+ignore_missing_imports = True
+
+# Tries to install grcpio which does not build. Only used for an example anyway
+[mypy-pydragon]
+ignore_missing_imports = True
+
+# jaraco/jaraco.develop#20
+# Lucretiel/autocommand#38
+[mypy-autocommand.*]
+ignore_missing_imports = True
diff --git a/pip_run/commands.py b/pip_run/commands.py
index 0547c9f..0c259c3 100644
--- a/pip_run/commands.py
+++ b/pip_run/commands.py
@@ -2,7 +2,7 @@
 import contextlib
 import pathlib
 
-from jaraco import env  # type: ignore # (python/mypy#15970)
+from jaraco import env
 from jaraco.context import suppress
 from jaraco.functools import bypass_when
 from more_itertools import locate, split_at
diff --git a/pip_run/compat/py310.py b/pip_run/compat/py310.py
index 7335c34..caed790 100644
--- a/pip_run/compat/py310.py
+++ b/pip_run/compat/py310.py
@@ -2,10 +2,12 @@
 Compatibility for Python 3.10 and earlier.
 """
 
+import sys
+
 __all__ = ['tomllib']
 
 
-try:
-    import tomllib  # type: ignore
-except ImportError:  # pragma: no cover
-    import tomli as tomllib  # type: ignore
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
diff --git a/pip_run/compat/py38.py b/pip_run/compat/py38.py
index 43a028a..69d6aab 100644
--- a/pip_run/compat/py38.py
+++ b/pip_run/compat/py38.py
@@ -7,11 +7,7 @@
     str if sys.version_info < (3, 9) and platform.system() == 'Windows' else identity
 )
 
-
-try:
-    from importlib.resources import files  # type: ignore
-except ImportError:  # pragma: no cover
-    from importlib_resources import files  # type: ignore
-
-
-files = files
+if sys.version_info >= (3, 9):
+    from importlib.resources import files as files
+else:  # pragma: no cover
+    from importlib_resources import files as files
diff --git a/pip_run/read-deps.py b/pip_run/read-deps.py
index 92004fe..24799e8 100644
--- a/pip_run/read-deps.py
+++ b/pip_run/read-deps.py
@@ -18,7 +18,7 @@ def separator(input) -> str:
 @autocommand.autocommand(__name__)
 def run(
     script: path.ExtantFile,
-    separator: separator = ' ',  # type: ignore
+    separator: separator = ' ',  # type: ignore[valid-type]
 ):
     """
     >>> run(['examples/test-mongodb-covered-query.py'])
@@ -30,5 +30,5 @@ def run(
     pytest
     jaraco.mongodb>=3.10
     """
-    joiner = separator.join  # type: ignore
+    joiner = separator.join  # type: ignore[attr-defined]
     print(joiner(DepsReader.try_read(pathlib.Path(script)).params()))
diff --git a/pyproject.toml b/pyproject.toml
index 08c5cda..f7a011b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -81,6 +81,7 @@ type = [
 	"pytest-mypy",
 
 	# local
+	"cowsay",
 ]
 
 
@@ -100,7 +101,3 @@ namespaces = true
 
 
 [tool.setuptools_scm]
-
-
-[tool.pytest-enabler.mypy]
-# Disabled due to jaraco/skeleton#143