Merge pull request #275 from ssciwr/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate
ssciwr · Sep 3, 2024 · d866c08 · d866c08
2 parents 9b3a6d6 + 3d7eadb
commit d866c08
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
         include:
           - os: "ubuntu-22.04"
             python-version: "3.10"
-            psychopy-version: "2024.1.2"
+            psychopy-version: "2024.1.4"
           - os: "ubuntu-22.04"
             python-version: "3.10"
             psychopy-version: "2023.2.3"
@@ -76,6 +76,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
+          name: "${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.psychopy-version }}"
           path: "*.*"
       - uses: codecov/codecov-action@v4
         with:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.5.0
     hooks:
       - id: ruff
         types_or: [python, pyi, jupyter]
@@ -32,13 +32,13 @@ repos:
           - "prettier-plugin-toml"
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.4
+    rev: 0.28.6
     hooks:
       - id: check-github-workflows
       - id: check-readthedocs
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.10.1
     hooks:
       - id: mypy
         additional_dependencies: [numpy, PyQt5-stubs, types-requests]
@@ -51,7 +51,7 @@ repos:
           ]
 
   - repo: https://github.com/rhysd/actionlint
-    rev: "v1.7.0"
+    rev: "v1.7.1"
     hooks:
       - id: actionlint
 

diff --git a/src/vstt/common.py b/src/vstt/common.py
@@ -22,10 +22,8 @@ def _has_valid_type(var: Any, correct_type: type) -> bool:
     if isinstance(var, correct_type):
         # var has the correct type
         return True
-    if correct_type in (float, int) and type(var) in (float, int):
-        # int instead of float or vice versa is ok
-        return True
-    return False
+    # int instead of float or vice versa is also ok - anything else is not
+    return correct_type in (float, int) and type(var) in (float, int)
 
 
 def import_typed_dict(

diff --git a/tests/test_task.py b/tests/test_task.py
@@ -22,8 +22,10 @@ def move_mouse_to_target(
 ) -> None:
     # wait until target is activated
     attempts = 0
+    sleep_interval = 0.1
     while not gtu.pixel_color(target_pixel, target_color):
-        sleep(0.1)
+        sleep(sleep_interval)
+        sleep_interval += 0.1
         # press Enter in case we are looking at a splash / display_results screen
         gtu.press_enter()
         attempts += 1
@@ -114,7 +116,7 @@ def test_task(
     for timestamps in data["to_target_timestamps"][0][0]:
         assert (
             timestamps[-1] - timestamps[0]
-            < 0.5 * experiment_no_results.trial_list[0]["target_duration"]
+            < 0.8 * experiment_no_results.trial_list[0]["target_duration"]
         )
     for dest in ["target", "center"]:
         assert np.all(data[f"to_{dest}_success"][0][0])
@@ -154,11 +156,11 @@ def test_task_no_automove_to_center(
     ):
         assert (
             to_target_timestamps[-1] - to_target_timestamps[0]
-            < 0.5 * experiment_no_results.trial_list[0]["target_duration"]
+            < 0.8 * experiment_no_results.trial_list[0]["target_duration"]
         )
         assert (
             to_center_timestamps[-1] - to_target_timestamps[0]
-            < 0.5 * experiment_no_results.trial_list[0]["target_duration"]
+            < 0.8 * experiment_no_results.trial_list[0]["target_duration"]
         )
     for dest in ["target", "center"]:
         assert np.all(data[f"to_{dest}_success"][0][0])