Bump mypy from 1.13.0 to 1.14.0 in the minor-patch-dependencies group (…

…#1525) * Bump mypy from 1.13.0 to 1.14.0 in the minor-patch-dependencies group Bumps the minor-patch-dependencies group with 1 update: [mypy](https://github.com/python/mypy). Updates `mypy` from 1.13.0 to 1.14.0 - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](python/mypy@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor dependency-group: minor-patch-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * Working on fixing types, removing old code for python 3.8. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Cottner <acottner@mozilla.com>
mozilla-services · Dec 23, 2024 · 1f8c309 · 1f8c309
1 parent 55f2558
commit 1f8c309
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 127 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ __pycache__
 .env
 .mypy_cache
 .install.stamp
+.vscode/
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ google-cloud-bigquery = "^3.27.0"
 pytest = "^8.3.4"
 aioresponses = "^0.7.7"
 pytest-aiohttp = "^1.0.5"
-mypy = "^1.13"
+mypy = "^1.14"
 pytest-cov = "^6.0.0"
 bandit = "^1.8.0"
 responses = "^0.25.3"

diff --git a/telescope/app.py b/telescope/app.py
@@ -102,7 +102,7 @@ def __init__(
 
     async def run(
         self, cache=None, events=None, force=False
-    ) -> Tuple[Any, bool, Any, int]:
+    ) -> Tuple[Any, bool, Any, float]:
         identifier = f"{self.project}/{self.name}"
 
         # Caution: the cache key may contain secrets and should never be exposed.

diff --git a/tests/checks/remotesettings/test_certificates_expiration.py b/tests/checks/remotesettings/test_certificates_expiration.py
@@ -3,7 +3,6 @@
 
 from checks.remotesettings.certificates_expiration import run
 from telescope.utils import utcnow
-from tests.utils import patch_async
 
 
 CERT = """
@@ -75,7 +74,7 @@ async def test_positive(mock_responses):
     )
 
     module = "checks.remotesettings.certificates_expiration"
-    with patch_async(f"{module}.fetch_certs", return_value=[fake_cert]) as mocked:
+    with mock.patch(f"{module}.fetch_certs", return_value=[fake_cert]) as mocked:
         status, data = await run(server_url, min_remaining_days=29)
         mocked.assert_called_with("http://fake-x5u")
 
@@ -89,7 +88,7 @@ async def test_negative(mock_responses):
     mock_http_calls(mock_responses, server_url)
 
     module = "checks.remotesettings.certificates_expiration"
-    with patch_async(f"{module}.fetch_text", return_value=CERT) as mocked:
+    with mock.patch(f"{module}.fetch_text", return_value=CERT) as mocked:
         status, data = await run(server_url, min_remaining_days=30)
         mocked.assert_called_with("http://fake-x5u")
 

diff --git a/tests/checks/remotesettings/test_collections_consistency.py b/tests/checks/remotesettings/test_collections_consistency.py
@@ -1,5 +1,6 @@
+from unittest import mock
+
 from checks.remotesettings.collections_consistency import has_inconsistencies, run
-from tests.utils import patch_async
 
 
 FAKE_AUTH = "Bearer abc"
@@ -219,8 +220,8 @@ async def test_positive(mock_responses):
     server_url = "http://fake.local/v1"
 
     module = "checks.remotesettings.collections_consistency"
-    with patch_async(f"{module}.fetch_signed_resources", return_value=RESOURCES):
-        with patch_async(f"{module}.has_inconsistencies", return_value=None):
+    with mock.patch(f"{module}.fetch_signed_resources", return_value=RESOURCES):
+        with mock.patch(f"{module}.has_inconsistencies", return_value=None):
             status, data = await run(server_url, FAKE_AUTH)
 
     assert status is True
@@ -231,8 +232,8 @@ async def test_negative(mock_responses):
     server_url = "http://fake.local/v1"
 
     m = "checks.remotesettings.collections_consistency"
-    with patch_async(f"{m}.fetch_signed_resources", return_value=RESOURCES):
-        with patch_async(f"{m}.has_inconsistencies", return_value="Some error"):
+    with mock.patch(f"{m}.fetch_signed_resources", return_value=RESOURCES):
+        with mock.patch(f"{m}.has_inconsistencies", return_value="Some error"):
             status, data = await run(server_url, FAKE_AUTH)
 
     assert status is False

diff --git a/tests/checks/remotesettings/test_latest_approvals.py b/tests/checks/remotesettings/test_latest_approvals.py
@@ -1,7 +1,8 @@
+from unittest import mock
+
 from checks.remotesettings.latest_approvals import get_latest_approvals, run
 from checks.remotesettings.utils import KintoClient
 from telescope.utils import utcnow
-from tests.utils import patch_async
 
 
 FAKE_AUTH = ""
@@ -91,8 +92,8 @@ async def test_positive(mock_responses):
             "source": {"bucket": "bid", "collection": "cid"},
         }
     ]
-    with patch_async(f"{module}.fetch_signed_resources", return_value=resources):
-        with patch_async(f"{module}.get_latest_approvals", return_value=INFOS):
+    with mock.patch(f"{module}.fetch_signed_resources", return_value=resources):
+        with mock.patch(f"{module}.get_latest_approvals", return_value=INFOS):
             status, data = await run({}, server_url, FAKE_AUTH)
 
     assert status is True

diff --git a/tests/checks/remotesettings/test_push_timestamp.py b/tests/checks/remotesettings/test_push_timestamp.py
@@ -4,7 +4,6 @@
 
 from checks.remotesettings.push_timestamp import BROADCAST_ID, get_push_timestamp, run
 from telescope.utils import utcfromtimestamp
-from tests.utils import patch_async
 
 
 MODULE = "checks.remotesettings.push_timestamp"
@@ -24,7 +23,7 @@ async def test_positive(mock_responses):
         },
     )
 
-    with patch_async(f"{MODULE}.get_push_timestamp", return_value="1573086234731"):
+    with mock.patch(f"{MODULE}.get_push_timestamp", return_value="1573086234731"):
         status, data = await run(
             remotesettings_server="http://server.local/v1", push_server=""
         )
@@ -58,7 +57,7 @@ async def test_positive_with_margin(mock_responses):
     )
 
     with mock.patch(f"{MODULE}.utcnow", return_value=server_datetime):
-        with patch_async(f"{MODULE}.get_push_timestamp", return_value=42):
+        with mock.patch(f"{MODULE}.get_push_timestamp", return_value=42):
             status, _ = await run(
                 remotesettings_server="http://server.local/v1", push_server=""
             )
@@ -76,7 +75,7 @@ async def test_negative(mock_responses):
         },
     )
 
-    with patch_async(f"{MODULE}.get_push_timestamp", return_value="2573086234731"):
+    with mock.patch(f"{MODULE}.get_push_timestamp", return_value="2573086234731"):
         status, data = await run(
             remotesettings_server="http://server.local/v1", push_server=""
         )

diff --git a/tests/checks/remotesettings/test_signatures_age.py b/tests/checks/remotesettings/test_signatures_age.py
@@ -3,7 +3,6 @@
 
 from checks.remotesettings.signatures_age import get_signature_age_hours, run
 from checks.remotesettings.utils import KintoClient
-from tests.utils import patch_async
 
 
 FAKE_AUTH = "Bearer abc"
@@ -42,8 +41,8 @@ async def test_get_signature_age_hours(mock_responses):
 async def test_positive(mock_responses):
     server_url = "http://fake.local/v1"
     module = "checks.remotesettings.signatures_age"
-    with patch_async(f"{module}.fetch_signed_resources", return_value=RESOURCES):
-        with patch_async(f"{module}.get_signature_age_hours", return_value=3):
+    with mock.patch(f"{module}.fetch_signed_resources", return_value=RESOURCES):
+        with mock.patch(f"{module}.get_signature_age_hours", return_value=3):
             status, data = await run(server_url, FAKE_AUTH, max_age=4)
 
     assert status is True
@@ -52,8 +51,8 @@ async def test_positive(mock_responses):
 
 async def test_negative(mock_responses):
     server_url = "http://fake.local/v1"
-    with patch_async(f"{MODULE}.fetch_signed_resources", return_value=RESOURCES):
-        with patch_async(f"{MODULE}.get_signature_age_hours", return_value=5):
+    with mock.patch(f"{MODULE}.fetch_signed_resources", return_value=RESOURCES):
+        with mock.patch(f"{MODULE}.get_signature_age_hours", return_value=5):
             status, data = await run(server_url, FAKE_AUTH, max_age=4)
 
     assert status is False

diff --git a/tests/checks/remotesettings/test_total_approvals.py b/tests/checks/remotesettings/test_total_approvals.py
@@ -4,7 +4,6 @@
 from checks.remotesettings.total_approvals import get_approvals, run
 from checks.remotesettings.utils import KintoClient
 from telescope.utils import utcnow
-from tests.utils import patch_async
 
 
 FAKE_AUTH = "Bearer abc"
@@ -52,8 +51,8 @@ async def test_positive(mock_responses):
         "cfr": 5,
     }
     with mock.patch(f"{module}.utcnow", return_value=datetime(1982, 5, 8)):
-        with patch_async(f"{module}.fetch_signed_resources", return_value=resources):
-            with patch_async(f"{module}.get_approvals", return_value=totals):
+        with mock.patch(f"{module}.fetch_signed_resources", return_value=resources):
+            with mock.patch(f"{module}.get_approvals", return_value=totals):
                 status, data = await run(server_url, FAKE_AUTH, period_days=1)
 
     assert status is True