Skip to content

Commit 3408d4b

Browse files
author
rokamu623
committed
Merge branch 'main' into refactor/response_time
2 parents ea65f5b + 9fc3ae4 commit 3408d4b

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/pytest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest
1010
steps:
1111
- name: Check out repository
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: Install LTTng
1515
run: |

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ repos:
1919
args: [--markdown-linebreak-ext=md]
2020

2121
- repo: https://github.com/igorshubovych/markdownlint-cli
22-
rev: v0.35.0
22+
rev: v0.36.0
2323
hooks:
2424
- id: markdownlint
2525
args: [-c, .markdownlint.yaml, --fix]
2626

2727
- repo: https://github.com/pre-commit/mirrors-prettier
28-
rev: v3.0.2
28+
rev: v3.0.3
2929
hooks:
3030
- id: prettier
3131

src/caret_analyze/record/record.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ def merge_processing_record_keys(processing_record: RecordInterface):
757757
for processing_record in records_need_to_merge:
758758
processing_record.data[sink_from_keys].add( # type: ignore
759759
record.get(copy_from_key))
760-
merge_processing_record_keys(processing_record)
760+
merge_processing_record_keys(processing_record) # type: ignore
761761
# No need for subsequent loops since we integrated them.
762762
break
763763

@@ -767,9 +767,9 @@ def merge_processing_record_keys(processing_record: RecordInterface):
767767
lambda x: record.get(source_key) in x.data[sink_from_keys], # type: ignore
768768
processing_records.values(),
769769
):
770-
addr = processing_record.get(sink_from_key)
770+
addr = processing_record.get(sink_from_key) # type: ignore
771771
merged_addresses.append(addr)
772-
processing_record.merge(record)
772+
processing_record.merge(record) # type: ignore
773773
merged_records.append(processing_record)
774774
for addr in merged_addresses:
775775
if addr in processing_records:

src/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
setuptools
22
colorcet
3-
pandas>=1.4.0
3+
pandas>=1.4.0,<2.1.0
44
bokeh<3
55
graphviz
66
types-pyyaml
77
pydantic>=1.9.0
8+
mypy==0.981

0 commit comments

Comments
 (0)