diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml index 8b47b3bb3..a7faa7d22 100644 --- a/.github/workflows/diff.yaml +++ b/.github/workflows/diff.yaml @@ -99,7 +99,7 @@ jobs: echo ${file} if [[ ${file} == *.py ]]; then python3 -m black --check --diff ${file} - python3 -m isort --check-only --diff ${file} + python3 -m isort --check-only --profile "black" --diff ${file} fi done diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5abd746c9..26b7c8e05 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,7 @@ repos: hooks: - id: isort name: isort (python) + args: ["--profile", "black"] - repo: https://github.com/pre-commit/mirrors-clang-format rev: v13.0.0 hooks: diff --git a/src/functions/awesome_memgraph_functions.hpp b/src/functions/awesome_memgraph_functions.hpp index 7acfa6943..7e716d970 100644 --- a/src/functions/awesome_memgraph_functions.hpp +++ b/src/functions/awesome_memgraph_functions.hpp @@ -56,10 +56,10 @@ template NameToFunction(const std::string &function_name); -inline const char kStartsWith[] = "STARTSWITH"; -inline const char kEndsWith[] = "ENDSWITH"; -inline const char kContains[] = "CONTAINS"; -inline const char kId[] = "ID"; +inline constexpr char kStartsWith[] = "STARTSWITH"; +inline constexpr char kEndsWith[] = "ENDSWITH"; +inline constexpr char kContains[] = "CONTAINS"; +inline constexpr char kId[] = "ID"; } // namespace memgraph::functions diff --git a/tests/e2e/distributed_queries/awesome_memgraph_functions.py b/tests/e2e/distributed_queries/awesome_memgraph_functions.py index 1c4bc87a4..0bdaa07a4 100644 --- a/tests/e2e/distributed_queries/awesome_memgraph_functions.py +++ b/tests/e2e/distributed_queries/awesome_memgraph_functions.py @@ -10,13 +10,16 @@ # licenses/APL.txt. import sys -import time -import typing import mgclient import pytest -from common import * +from common import ( + connection, + execute_and_fetch_all, + has_n_result_row, + wait_for_shard_manager_to_initialize, +) def test_awesome_memgraph_functions(connection):