diff --git a/dev-requirements.txt b/dev-requirements.txt index e801c4c77..9512d6e8a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,17 +1,17 @@ pytest==7.0.1 -flake8==5.0.4 -black==22.8.0 +flake8==6.0.0 +black==23.3.0 mypy==0.971 -isort==5.10.1 +isort==5.12.0 PyYAML==6.0 docker==5.0.0 six==1.16.0 types-requests==0.1.9 -types-dataclasses==0.1.5 +types-dataclasses==0.6.6 types-psutil==5.8.19 types-PyYAML==6.0.3 types-pkg-resources==0.1.3 types-protobuf==3.19.22 types-toml==0.10.8 types-retry==0.9.9 -types-beautifulsoup4==4.11.1 \ No newline at end of file +types-beautifulsoup4==4.11.1 diff --git a/gprofiler/gprofiler_types.py b/gprofiler/gprofiler_types.py index e79460004..c9b6f976d 100644 --- a/gprofiler/gprofiler_types.py +++ b/gprofiler/gprofiler_types.py @@ -35,7 +35,6 @@ class ProfileData: class ProfilingErrorStack(StackToSampleCount): - PROFILING_ERROR_STACK_PATTERN = re.compile(r".*;\[Profiling .+: .+\]") def __init__(self, what: str, reason: str, comm: str): @@ -55,7 +54,7 @@ def attach_error_to_stacks( ) -> StackToSampleCount: _, error_frame = next(iter(error_stack)).split(";", maxsplit=1) dest_stacks: StackToSampleCount = StackToSampleCount() - for (frame, count) in source_stacks.items(): + for frame, count in source_stacks.items(): comm, stack = frame.split(";", maxsplit=1) annotated = f"{comm};{error_frame};{stack}" dest_stacks[annotated] = count diff --git a/granulate-utils b/granulate-utils index b9f1eb07b..7abb9620d 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit b9f1eb07b9768342d18dfc8859d7e32210cba7c7 +Subproject commit 7abb9620d3b487242ce7922c513f1eb0a7a3432a diff --git a/requirements.txt b/requirements.txt index a3a824d85..88f998dc9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ ConfigArgParse==1.3 distro==1.7.0 setuptools==65.5.1 # For pkg_resources six==1.16.0 -packaging==21.2 +packaging==23.1 pyelftools==0.28 curlify==2.2.1 retry==0.9.2 diff --git a/tests/conftest.py b/tests/conftest.py index 84b6dafc6..be1c420de 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -353,7 +353,6 @@ def application_docker_image( runtime: str, application_image_tag: str, ) -> Iterable[Image]: - if is_aarch64(): if runtime == "nodejs": if application_image_tag == "12-glibc": diff --git a/tests/test_app_metadata.py b/tests/test_app_metadata.py index 2b8119eee..799c7a112 100644 --- a/tests/test_app_metadata.py +++ b/tests/test_app_metadata.py @@ -205,7 +205,9 @@ def test_app_metadata( assert application_docker_container.name in metadata["containers"] # find its app metadata index - find a stack line from the app of this container - stack = next(filter(lambda l: application_docker_container.name in l and application_executable in l, lines[1:])) + stack = next( + filter(lambda line: application_docker_container.name in line and application_executable in line, lines[1:]) + ) # stack begins with index idx = int(stack.split(";")[0]) diff --git a/tests/test_java.py b/tests/test_java.py index fd0cfdd85..1c59a1fc2 100644 --- a/tests/test_java.py +++ b/tests/test_java.py @@ -384,7 +384,6 @@ def test_sanity_other_jvms( search_for: str, profiler_state: ProfilerState, ) -> None: - if is_aarch64(): pytest.xfail( "Different JVMs are not supported on aarch64, see https://github.com/Granulate/gprofiler/issues/717"