Merge pull request #105 from NHSDigital/jm-mesh-2092-dependabot

MESH-2092: Ruff and pytest-asyncio version bumps

Author: johnmarston-nhs

.vscode/settings.json

@@ -2,7 +2,7 @@
     "editor.formatOnSave": true,
     "[python]": {
         "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
         }
     },
     "isort.args": [

Makefile

@@ -58,13 +58,13 @@ shellcheck:
 	docker run --rm -i -v ${PWD}:/mnt:ro koalaman/shellcheck -f gcc -e SC1090,SC1091 `find . \( -path "*/.venv/*" -prune -o -path "*/build/*" -prune -o -path "*/.tox/*" -prune -o -path "*/java_client/*" -prune  \) -o -type f -name '*.sh' -print` || test $$? -eq 1
 
 ruff: black
-	poetry run ruff --fix --show-fixes .
+	poetry run ruff check --fix --show-fixes .
 
 ruff-check:
-	poetry run ruff .
+	poetry run ruff check .
 
 ruff-ci:
-	poetry run ruff --output-format=github .
+	poetry run ruff check --output-format=github .
 
 lint: ruff mypy shellcheck
 

poetry.lock

@@ -28,9 +28,9 @@ black = "^24.3.0"
 mypy = "^1.11.1"
 coverage = "^7.6.0"
 pytest = "^8.3.2"
-pytest-asyncio = "^0.23.8"
+pytest-asyncio = "^0.24.0"
 tox = "^4.16.0"
-ruff = "^0.2.0"
+ruff = "^0"
 
 
 [tool.poetry.group.local.dependencies]

pyproject.toml

@@ -17,7 +17,7 @@ def reset_logging_storage():
     logging_context.thread_local_context_storage()
 
 
-@pytest.fixture()
+@pytest.fixture
 def unlock_global_setup():
     # Enable the app logger to be set up again
     app_logger._is_setup = False

tests/conftest.py

@@ -647,7 +647,7 @@ async def test_end_action_when_action_already_popped(log_capture: Tuple[List[dic
 
     assert not std_err
     assert len(std_out) == 1
-    assert type(std_out[0]["logger_error"]) == ActionNotInStack
+    assert type(std_out[0]["logger_error"]) is ActionNotInStack
     assert std_out[0]["log_info"]["level"] == "WARNING"
 
 
@@ -663,7 +663,7 @@ async def test_end_action_when_action_already_popped_with_exception(
 
     assert not std_out
     assert len(std_err) == 1
-    assert type(std_err[0]["logger_error"]) == ActionNotInStack
+    assert type(std_err[0]["logger_error"]) is ActionNotInStack
     assert std_err[0]["log_info"]["level"] == "ERROR"
 
 
@@ -1083,7 +1083,7 @@ async def a_function():
     assert std_out[0]["log_info"]["level"] == "INFO"
 
 
-@pytest.mark.skip()
+@pytest.mark.skip
 async def test_async_generator_resolved_later(log_capture: Tuple[List[dict], List[dict]]):
     _, _ = log_capture
 
@@ -1192,7 +1192,7 @@ def error_function(raise_value_error):
     with pytest.raises(NotImplementedError) as ex:
         error_function(raise_value_error=False)
 
-    assert ex.type == NotImplementedError
+    assert ex.type is NotImplementedError
 
     assert len(std_err) == 1
 
@@ -1202,7 +1202,7 @@ def error_function(raise_value_error):
     with pytest.raises(ValueError, match="test") as ex:
         error_function(raise_value_error=True)
 
-    assert ex.type == ValueError
+    assert ex.type is ValueError
     assert ex.value
 
     assert len(std_err) == 0
@@ -1229,7 +1229,7 @@ def error_function(raise_value_error):
     with pytest.raises(NotImplementedError) as ex:
         error_function(raise_value_error=False)
 
-    assert ex.type == NotImplementedError
+    assert ex.type is NotImplementedError
 
     assert len(std_err) == 1
 
@@ -1322,7 +1322,7 @@ def error_function(raise_value_error):
     with temporary_global_fields(expected_errors=(ValueError,)), pytest.raises(ValueError, match="test") as ex:
         error_function(raise_value_error=True)
 
-    assert ex.type == ValueError
+    assert ex.type is ValueError
     assert ex.value
 
     assert len(std_err) == 0
@@ -1349,7 +1349,7 @@ def error_function(raise_value_error):
     with temporary_global_fields(expected_errors=(ValueError,)), pytest.raises(ValueError, match="test") as ex:
         error_function(raise_value_error=True)
 
-    assert ex.type == ValueError
+    assert ex.type is ValueError
     assert ex.value
 
     assert len(std_err) == 0
@@ -1367,7 +1367,7 @@ def error_function(raise_value_error):
     with temporary_global_fields(expected_errors=(NotImplementedError,)), pytest.raises(NotImplementedError) as ex:
         error_function(raise_value_error=False)
 
-    assert ex.type == NotImplementedError
+    assert ex.type is NotImplementedError
     assert ex.value
 
     assert len(std_err) == 0
@@ -1398,7 +1398,7 @@ def error_function(exception_class=None):
         async with log_action("wrapper", expected_errors=(ValueError,)):
             await run_in_executor(error_function)
 
-    assert ex.type == NotImplementedError
+    assert ex.type is NotImplementedError
 
     assert len(std_out) == 0
     assert len(std_err) == 2