CI fixes for 0.50 (backport #2680, #2677, #2682) (#2693)

* ci: pin riot to 0.6 (#2680)

We broke some things in 0.7 so lets pin until we can get them fixed up.

(cherry picked from commit 311bb02)

* Added missing_import ignore to mypy config and codespell excludes config. (#2677)

(cherry picked from commit 91469c6)

* mysql-connector-python 8.0.24 requires Python 3.6 (#2682)

(cherry picked from commit 695e715)

Co-authored-by: Kyle Verhoog <[email protected]>
Co-authored-by: Yun Kim <[email protected]>
Co-authored-by: Nicolas Vivet <[email protected]>

Author: 4 people

.circleci/config.yml

@@ -72,7 +72,7 @@ commands:
     description: "Install riot"
     steps:
       # Make sure we install and run riot on Python 3
-      - run: pip3 install -U riot
+      - run: pip3 install riot==0.6
 
   restore_tox_cache:
     description: "Restore .tox directory from previous runs for faster installs"

benchmarks/django_simple.Dockerfile

@@ -1,6 +1,6 @@
 ARG PYTHON_VERSION=3.9-slim-buster
 
-# define an alias for the specfic python version used in this file.
+# define an alias for the specific python version used in this file.
 FROM python:${PYTHON_VERSION} as python
 
 # Python build stage

ddtrace/ext/sql.py

@@ -21,7 +21,7 @@ def normalize_vendor(vendor):
 
 
 try:
-    from psycopg2.extensions import parse_dsn as parse_pg_dsn  # type: ignore[import]
+    from psycopg2.extensions import parse_dsn as parse_pg_dsn
 except ImportError:
 
     def parse_pg_dsn(dsn):

ddtrace/internal/compat.py

@@ -231,7 +231,7 @@ def get_connection_response(
 
 
 try:
-    from pep562 import Pep562  # type: ignore[import]  # noqa
+    from pep562 import Pep562  # noqa
 
     def ensure_pep562(module_name):
         # type: (str) -> None

ddtrace/internal/nogevent.py

@@ -10,7 +10,7 @@
 
 
 try:
-    import gevent.monkey  # type: ignore[import]
+    import gevent.monkey
 except ImportError:
 
     def get_original(module, func):

ddtrace/internal/uwsgi.py

@@ -22,7 +22,7 @@ def check_uwsgi(worker_callback=None, atexit=None):
     :param worker_callback: Callback function to call in uWSGI worker processes.
     """
     try:
-        import uwsgi  # type: ignore[import]
+        import uwsgi
     except ImportError:
         return
 
@@ -47,7 +47,7 @@ def check_uwsgi(worker_callback=None, atexit=None):
         # Register the function to be called in child process at startup
         if worker_callback is not None:
             try:
-                import uwsgidecorators  # type: ignore[import]
+                import uwsgidecorators
             except ImportError:
                 raise uWSGIConfigError("Running under uwsgi but uwsgidecorators cannot be imported")
             uwsgidecorators.postfork(worker_callback)

ddtrace/profiling/collector/threading.py

@@ -58,7 +58,7 @@ def _current_thread():
     WRAPT_C_EXT = False
 else:
     try:
-        import ddtrace.vendor.wrapt._wrappers as _w  # type: ignore[import] # noqa: F401
+        import ddtrace.vendor.wrapt._wrappers as _w  # noqa: F401
     except ImportError:
         WRAPT_C_EXT = False
     else:

ddtrace/utils/config.py

@@ -7,7 +7,7 @@ def get_application_name():
     # type: () -> typing.Optional[str]
     """Attempts to find the application name using system arguments."""
     try:
-        import __main__  # type: ignore[import]
+        import __main__
 
         name = __main__.__file__
     except (ImportError, AttributeError):

mypy.ini

@@ -4,6 +4,7 @@ show_error_codes = true
 warn_unused_ignores = true
 warn_unused_configs = true
 no_implicit_optional = true
+ignore_missing_imports = true
 
 [mypy-ddtrace.contrib.*]
 ignore_errors = true

riotfile.py

@@ -740,7 +740,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                     pkgs={"mysql-connector-python": ["==8.0.5", "<8.0.24"]},
                 ),
                 Venv(
-                    pys=select_pys(min_version="3"),
+                    pys=select_pys(min_version="3.6"),
                     pkgs={"mysql-connector-python": ["==8.0.5", ">=8.0", latest]},
                 ),
             ],
@@ -833,7 +833,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
                     },
                 ),
                 Venv(
-                    pys=select_pys(min_version="3"),
+                    pys=select_pys(min_version="3.6"),
                     pkgs={
                         "sqlalchemy": ["~=1.0.0", "~=1.1.0", "~=1.2.0", "~=1.3.0", latest],
                         "psycopg2": ["~=2.8.0"],