Fix mypy tests (DataDog#10134)

kkourtchikov · Sep 15, 2021 · aad7c43 · aad7c43
1 parent e28eb39
commit aad7c43
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 9 deletions.
diff --git a/aerospike/tox.ini b/aerospike/tox.ini
@@ -17,6 +17,8 @@ dd_check_types = true
 dd_mypy_args =
     --py2
     --follow-imports silent
+    --install-types
+    --non-interactive
     datadog_checks/aerospike
 usedevelop = true
 platform = linux|darwin|win32

diff --git a/azure_iot_edge/tox.ini b/azure_iot_edge/tox.ini
@@ -13,7 +13,14 @@ envdir =
     py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = --check-untyped-defs --py2 datadog_checks/ tests/
+dd_mypy_args =
+    --check-untyped-defs
+    --py2
+    --install-types
+    --non-interactive
+    --follow-imports skip
+    datadog_checks/
+    tests/
 description =
     py{27,38}: e2e ready if IOT_EDGE_CONNSTR
 usedevelop = true

diff --git a/cloud_foundry_api/tox.ini b/cloud_foundry_api/tox.ini
@@ -8,7 +8,14 @@ envlist =
 [testenv]
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = --py2 datadog_checks/ tests/
+dd_mypy_args =
+    --py2
+    --install-types
+    --non-interactive
+    datadog_checks/
+    tests/
+dd_mypy_deps =
+    types-mock==0.1.5
 usedevelop = true
 platform = linux|darwin|win32
 deps =

diff --git a/datadog_checks_base/tox.ini b/datadog_checks_base/tox.ini
@@ -16,6 +16,8 @@ dd_mypy_args =
     --py2
     --check-untyped-defs
     --follow-imports silent
+    --install-types
+    --non-interactive
     datadog_checks/base/checks/base.py
     datadog_checks/base/checks/win/wmi/__init__.py
     datadog_checks/base/checks/win/winpdh_base.py

diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py
@@ -13,6 +13,7 @@
 STYLE_FLAG = 'dd_check_style'
 TYPES_FLAG = 'dd_check_types'
 MYPY_ARGS_OPTION = 'dd_mypy_args'
+MYPY_ADDITIONAL_DEPS = 'dd_mypy_deps'
 E2E_READY_CONDITION = 'e2e ready if'
 FIX_DEFAULT_ENVDIR_FLAG = 'ensure_default_envdir'
 
@@ -142,11 +143,15 @@ def add_style_checker(config, sections, make_envconfig, reader):
         # Each integration should explicitly specify its options and which files it'd like to type check, which is
         # why we're defaulting to 'no arguments' by default.
         mypy_args = sections['testenv'].get(MYPY_ARGS_OPTION, '')
+        mypy_deps = sections['testenv'].get(MYPY_ADDITIONAL_DEPS, "").splitlines()
 
         # Allow using multiple lines for enhanced readability in case of large amount of options/files to check.
         mypy_args = mypy_args.replace('\n', ' ')
 
         dependencies.append(MYPY_DEP)
+        for mypy_dep in mypy_deps:
+            dependencies.append(mypy_dep)
+
         commands.append('mypy --config-file=../mypy.ini {}'.format(mypy_args))
 
     sections[section] = {

diff --git a/glusterfs/tox.ini b/glusterfs/tox.ini
@@ -14,7 +14,14 @@ envdir =
     py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = --py2 datadog_checks/ tests/ --exclude '.*/config_models/.*\.py$'
+dd_mypy_args =
+    --py2
+    datadog_checks/
+    tests/
+    --exclude
+    '.*/config_models/.*\.py$'
+dd_mypy_deps =
+    types-mock==0.1.5
 usedevelop = true
 platform = linux|darwin|win32
 deps =

diff --git a/ibm_mq/tox.ini b/ibm_mq/tox.ini
@@ -14,7 +14,16 @@ description=
     py{27,38}: e2e ready
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = --py2 datadog_checks/ tests/ --exclude '.*/config_models/.*\.py$'
+dd_mypy_args =
+    --py2
+    --install-types
+    --non-interactive
+    datadog_checks/
+    tests/
+    --exclude
+    '.*/config_models/.*\.py$'
+dd_mypy_deps =
+    types-mock==0.1.5
 platform = linux|darwin|win32
 deps =
     -e../datadog_checks_base[deps]

diff --git a/marklogic/tox.ini b/marklogic/tox.ini
@@ -7,7 +7,15 @@ envlist =
 
 [testenv]
 dd_check_types = true
-dd_mypy_args = --disallow-untyped-defs --py2 datadog_checks/ tests/
+dd_mypy_args =
+    --disallow-untyped-defs
+    --py2
+    --install-types
+    --non-interactive
+    datadog_checks/
+    tests/
+dd_mypy_deps =
+    types-mock==0.1.5
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/mysql/tox.ini b/mysql/tox.ini
@@ -17,7 +17,11 @@ dd_mypy_args =
     --py2
     --check-untyped-defs
     --follow-imports silent
+    --install-types
+    --non-interactive
     datadog_checks/mysql/statements.py
+dd_mypy_deps =
+    types-cachetools==0.1.10
 usedevelop = true
 platform = linux|darwin|win32
 passenv =

diff --git a/postgres/tox.ini b/postgres/tox.ini
@@ -13,7 +13,16 @@ description =
     py{27,38}: e2e ready
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = --py2 datadog_checks/ tests/ --exclude '.*/config_models/.*\.py$'
+dd_mypy_args =
+    --py2
+    --install-types
+    --non-interactive
+    datadog_checks/
+    tests/
+    --exclude '.*/config_models/.*\.py$'
+dd_mypy_deps =
+    types-mock==0.1.5
+    types-cachetools==0.1.10
 usedevelop = true
 platform = linux|darwin|win32
 passenv =

diff --git a/rethinkdb/tox.ini b/rethinkdb/tox.ini
@@ -12,7 +12,15 @@ envdir =
     py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = --py2 --disallow-untyped-defs datadog_checks/ tests/
+dd_mypy_args =
+    --py2
+    --disallow-untyped-defs
+    --install-types
+    --non-interactive
+    datadog_checks/
+    tests/
+dd_mypy_deps =
+    types-mock==0.1.5
 description =
     py{27,38}: e2e ready
 usedevelop = true

diff --git a/snmp/tox.ini b/snmp/tox.ini
@@ -18,6 +18,8 @@ dd_mypy_args =
     --py2
     --disallow-untyped-defs
     --follow-imports silent
+    --install-types
+    --non-interactive
     datadog_checks/snmp
 usedevelop = true
 platform = linux|darwin|win32

diff --git a/snowflake/tox.ini b/snowflake/tox.ini
@@ -12,7 +12,16 @@ envdir =
     py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = --py2 datadog_checks/ tests/ --exclude '.*/config_models/.*\.py$'
+dd_mypy_args =
+    --py2
+    --install-types
+    --non-interactive
+    datadog_checks/
+    tests/
+    --exclude
+    '.*/config_models/.*\.py$'
+dd_mypy_deps =
+    types-mock==0.1.5
 description =
     py38: e2e ready
 usedevelop = true

diff --git a/voltdb/tox.ini b/voltdb/tox.ini
@@ -12,7 +12,16 @@ envdir =
     py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
-dd_mypy_args = datadog_checks/ tests/
+dd_mypy_args =
+    --py2
+    --install-types
+    --non-interactive
+    datadog_checks/
+    tests/
+    --exclude
+    '.*/config_models/.*\.py$'
+dd_mypy_deps =
+    types-mock==0.1.5
 description =
     py{27,38}: e2e ready
 usedevelop = true

diff --git a/vsphere/tox.ini b/vsphere/tox.ini
@@ -15,6 +15,8 @@ dd_mypy_args =
     --py2
     --disallow-untyped-defs
     --follow-imports silent
+    --install-types
+    --non-interactive
     datadog_checks/vsphere/api.py
     datadog_checks/vsphere/api_rest.py
     datadog_checks/vsphere/cache.py