PYTHON-3513 Correctly pin to mypy==0.990 (#1110)

Author: ShaneHarvey

.github/workflows/test-python.yml

@@ -39,7 +39,6 @@ jobs:
           mongodb-version: 4.4
       - name: Run tests
         run: |
-          pip install mypy==0.942
           python setup.py test
 
   mypytest:
@@ -59,7 +58,7 @@ jobs:
           cache-dependency-path: 'setup.py'
       - name: Install dependencies
         run: |
-          python -m pip install -U pip mypy
+          python -m pip install -U pip mypy==0.990
           pip install -e ".[zstd, encryption, ocsp]"
       - name: Run mypy
         run: |

pymongo/monitor.py

@@ -430,10 +430,10 @@ def _shutdown_monitors():
 def _shutdown_resources():
     # _shutdown_monitors/_shutdown_executors may already be GC'd at shutdown.
     shutdown = _shutdown_monitors
-    if shutdown:
+    if shutdown:  # type:ignore[truthy-function]
         shutdown()
     shutdown = _shutdown_executors
-    if shutdown:
+    if shutdown:  # type:ignore[truthy-function]
         shutdown()
 
 

test/mockupdb/test_mixed_version_sharded.py

@@ -19,10 +19,11 @@
 from queue import Queue
 
 from mockupdb import MockupDB, go
-from operations import upgrades
 
 from pymongo import MongoClient
 
+from .operations import upgrades
+
 
 class TestMixedVersionSharded(unittest.TestCase):
     def setup_server(self, upgrade):

test/mockupdb/test_mongos_command_read_mode.py

@@ -16,7 +16,6 @@
 import unittest
 
 from mockupdb import MockupDB, OpMsg, going
-from operations import operations
 
 from pymongo import MongoClient, ReadPreference
 from pymongo.read_preferences import (
@@ -25,6 +24,8 @@
     read_pref_mode_from_name,
 )
 
+from .operations import operations
+
 
 class TestMongosCommandReadMode(unittest.TestCase):
     def test_aggregate(self):

test/mockupdb/test_op_msg_read_preference.py

@@ -18,7 +18,6 @@
 from typing import Any
 
 from mockupdb import CommandBase, MockupDB, going
-from operations import operations
 
 from pymongo import MongoClient, ReadPreference
 from pymongo.read_preferences import (
@@ -27,6 +26,8 @@
     read_pref_mode_from_name,
 )
 
+from .operations import operations
+
 
 class OpMsgReadPrefBase(unittest.TestCase):
     single_mongod = False

test/mockupdb/test_reset_and_request_check.py

@@ -17,12 +17,13 @@
 import unittest
 
 from mockupdb import MockupDB, going, wait_until
-from operations import operations
 
 from pymongo import MongoClient
 from pymongo.errors import ConnectionFailure
 from pymongo.server_type import SERVER_TYPE
 
+from .operations import operations
+
 
 class TestResetAndRequestCheck(unittest.TestCase):
     def __init__(self, *args, **kwargs):

test/mockupdb/test_slave_okay_rs.py

@@ -20,10 +20,11 @@
 import unittest
 
 from mockupdb import MockupDB, going
-from operations import operations
 
 from pymongo import MongoClient
 
+from .operations import operations
+
 
 class TestSlaveOkayRS(unittest.TestCase):
     def setup_server(self):

test/mockupdb/test_slave_okay_sharded.py

@@ -23,11 +23,12 @@
 from queue import Queue
 
 from mockupdb import MockupDB, going
-from operations import operations
 
 from pymongo import MongoClient
 from pymongo.read_preferences import make_read_preference, read_pref_mode_from_name
 
+from .operations import operations
+
 
 class TestSlaveOkaySharded(unittest.TestCase):
     def setup_server(self):

test/mockupdb/test_slave_okay_single.py

@@ -23,12 +23,13 @@
 import unittest
 
 from mockupdb import MockupDB, going
-from operations import operations
 
 from pymongo import MongoClient
 from pymongo.read_preferences import make_read_preference, read_pref_mode_from_name
 from pymongo.topology_description import TOPOLOGY_TYPE
 
+from .operations import operations
+
 
 def topology_type_name(client):
     topology_type = client._topology._description.topology_type