Merge branch 'main' into refactor/response_time

tier4 · Sep 7, 2023 · 3408d4b · 3408d4b
2 parents ea65f5b + 9fc3ae4
commit 3408d4b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -9,7 +9,7 @@ jobs:
     container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install LTTng
         run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,13 +19,13 @@ repos:
         args: [--markdown-linebreak-ext=md]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.35.0
+    rev: v0.36.0
     hooks:
       - id: markdownlint
         args: [-c, .markdownlint.yaml, --fix]
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.2
+    rev: v3.0.3
     hooks:
       - id: prettier
 

diff --git a/src/caret_analyze/record/record.py b/src/caret_analyze/record/record.py
@@ -757,7 +757,7 @@ def merge_processing_record_keys(processing_record: RecordInterface):
                 for processing_record in records_need_to_merge:
                     processing_record.data[sink_from_keys].add(  # type: ignore
                         record.get(copy_from_key))
-                    merge_processing_record_keys(processing_record)
+                    merge_processing_record_keys(processing_record)  # type: ignore
                     # No need for subsequent loops since we integrated them.
                     break
 
@@ -767,9 +767,9 @@ def merge_processing_record_keys(processing_record: RecordInterface):
                     lambda x: record.get(source_key) in x.data[sink_from_keys],  # type: ignore
                     processing_records.values(),
                 ):
-                    addr = processing_record.get(sink_from_key)
+                    addr = processing_record.get(sink_from_key)  # type: ignore
                     merged_addresses.append(addr)
-                    processing_record.merge(record)
+                    processing_record.merge(record)  # type: ignore
                     merged_records.append(processing_record)
                 for addr in merged_addresses:
                     if addr in processing_records:

diff --git a/src/requirements.txt b/src/requirements.txt
@@ -1,7 +1,8 @@
 setuptools
 colorcet
-pandas>=1.4.0
+pandas>=1.4.0,<2.1.0
 bokeh<3
 graphviz
 types-pyyaml
 pydantic>=1.9.0
+mypy==0.981