Upgrade mypy t 1.5 (#1964)

* upgrade mypy * Upgrade mypy * fix * fix mypy issueS * formatting * try * fix
cds-snc · Aug 25, 2023 · f201dad · f201dad
1 parent b21c966
commit f201dad
Show file tree

Hide file tree

Showing 9 changed files with 481 additions and 3,017 deletions.
diff --git a/app/celery/scheduled_tasks.py b/app/celery/scheduled_tasks.py
@@ -190,7 +190,7 @@ def check_job_status():
 
     # temporarily mark them as ERROR so that they don't get picked up by future check_job_status tasks
     # if they haven't been re-processed in time.
-    job_ids: List[str] = []
+    job_ids: List[str] = []  # type: ignore
     for job in jobs_not_complete_after_30_minutes:
         job.job_status = JOB_STATUS_ERROR
         dao_update_job(job)

diff --git a/app/celery/tasks.py b/app/celery/tasks.py
@@ -268,7 +268,7 @@ def save_smss(self, service_id: Optional[str], signed_notifications: List[Signed
             "template_version": template.version,
             "recipient": _notification.get("to"),
             "personalisation": _notification.get("personalisation"),
-            "notification_type": SMS_TYPE,
+            "notification_type": SMS_TYPE,  # type: ignore
             "simulated": _notification.get("simulated", None),
             "api_key_id": _notification.get("api_key", None),
             "created_at": datetime.utcnow(),
@@ -278,7 +278,7 @@ def save_smss(self, service_id: Optional[str], signed_notifications: List[Signed
 
         verified_notifications.append(notification)
         notification_id_queue[notification_id] = notification.get("queue")  # type: ignore
-        process_type = template.process_type
+        process_type = template.process_type  # type: ignore
 
     try:
         # If the data is not present in the encrypted data then fallback on whats needed for process_job.
@@ -379,7 +379,7 @@ def save_emails(self, _service_id: Optional[str], signed_notifications: List[Sig
             "template_version": template.version,
             "recipient": _notification.get("to"),
             "personalisation": _notification.get("personalisation"),
-            "notification_type": EMAIL_TYPE,
+            "notification_type": EMAIL_TYPE,  # type: ignore
             "simulated": _notification.get("simulated", None),
             "api_key_id": _notification.get("api_key", None),
             "created_at": datetime.utcnow(),

diff --git a/app/json_provider.py b/app/json_provider.py
@@ -7,8 +7,8 @@
 def default_encoder(o):
     # Support for sqlalchemy.engine.row.Row
     if isinstance(o, Row):
-        row: Row = o
-        m: dict = row._asdict()
+        row: Row = o  # type: ignore
+        m: dict = row._asdict()  # type: ignore
         return m
     # Redirect to default
     return _default(o)

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -91,7 +91,7 @@ rfc3987 = "1.3.8"
 jinja2-cli = { extras = ["yaml"], version = "0.8.2" }
 black = "23.7.0"
 locust = "2.16.1"
-mypy = "0.991"
+mypy = "1.5"
 sqlalchemy-stubs = "0.4"
 sqlalchemy2-stubs = "0.0.2a34"
 networkx = "2.8.8" # not directly required, pinned by Snyk to avoid a vulnerability

diff --git a/tests/app/aws/test_metrics.py b/tests/app/aws/test_metrics.py
@@ -19,7 +19,7 @@
 class TestBatchSavingMetricsFunctions:
     @pytest.fixture(autouse=True)
     def app(self):
-        config: Config = Test()
+        config: Config = Test()  # type: ignore
         config.REDIS_ENABLED = True
         app = Flask(config.NOTIFY_ENVIRONMENT)
         create_app(app, config)

diff --git a/tests/app/test_json_provider.py b/tests/app/test_json_provider.py
@@ -13,5 +13,5 @@ def row(self, mocker):
 
     def test_serialization_row(self, notify_api, row):
         jp = NotifyJSONProvider(notify_api)
-        serialized: str = jp.dumps(row)
+        serialized: str = jp.dumps(row)  # type: ignore
         assert '{"key1": "value1", "key2": "value2"}' in serialized
diff --git a/tests/app/test_queue.py b/tests/app/test_queue.py
@@ -65,7 +65,7 @@ def test_when_get_inflight_name_suffix_process_type_is_supplied(self):
 class TestRedisQueue:
     @pytest.fixture(autouse=True)
     def app(self):
-        config: Config = Test()
+        config: Config = Test()  # type: ignore
         config.REDIS_ENABLED = True
         app = Flask(config.NOTIFY_ENVIRONMENT)
         create_app(app, config)
@@ -344,7 +344,7 @@ def test_acknowledged_messages(self, mock_queue):
 class TestRedisQueueMetricUsage:
     @pytest.fixture(autouse=True)
     def app(self):
-        config: Config = Test()
+        config: Config = Test()  # type: ignore
         config.REDIS_ENABLED = True
         app = Flask(config.NOTIFY_ENVIRONMENT)
         create_app(app, config)