From f4452b94d84e694663f5dc9f84bcfe7d6bce8267 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 21:22:28 +0300 Subject: [PATCH 1/9] Upgrade Python packages This commit is an incremental upgrade for some of our packages. --- dev-requirements.txt | 10 +++++----- gprofiler/gprofiler_types.py | 3 +-- granulate-utils | 2 +- tests/conftest.py | 1 - tests/test_app_metadata.py | 4 +++- tests/test_java.py | 1 - 6 files changed, 10 insertions(+), 11 deletions(-) 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 38d7add30..e7908b98a 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 38d7add30a082eab46ff6b42b428c54337c8a4e3 +Subproject commit e7908b98a0c33a2616986073e24bd0bf9cecfda0 diff --git a/tests/conftest.py b/tests/conftest.py index 6d184b455..685d16bac 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -363,7 +363,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" From 201fa9eeeed2d4db1f31527cf457e6ebbeafe3fd Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 21:25:27 +0300 Subject: [PATCH 2/9] upgrade --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index e7908b98a..2992a6278 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit e7908b98a0c33a2616986073e24bd0bf9cecfda0 +Subproject commit 2992a6278f1c3936c3e71428a9848d75aed23e9b From 789ffa4e4d307a4f96bde3f00b0be51e856d9018 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 23:34:53 +0300 Subject: [PATCH 3/9] update --- granulate-utils | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/granulate-utils b/granulate-utils index 2992a6278..8d4be3cb2 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 2992a6278f1c3936c3e71428a9848d75aed23e9b +Subproject commit 8d4be3cb2a8e976fe8ed7eaadad3adf52c3e6382 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 From 30dc1b9a63159d5211f420edcc22f24863ff9069 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 23:37:37 +0300 Subject: [PATCH 4/9] update --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index 8d4be3cb2..8c332bbf3 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 8d4be3cb2a8e976fe8ed7eaadad3adf52c3e6382 +Subproject commit 8c332bbf3a3857ab5ea93ad9a0571b0e17548ffb From 411202a61d2a19ed7959b1f1fa3e419df0b3d916 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Sat, 15 Apr 2023 23:51:33 +0300 Subject: [PATCH 5/9] update --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index 8c332bbf3..85fb11469 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 8c332bbf3a3857ab5ea93ad9a0571b0e17548ffb +Subproject commit 85fb1146991ddc48f04866076b9a40234dd7976c From 69a7e1914a472f6d72b5ad840dcf4f051410ad63 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Mon, 17 Apr 2023 11:27:14 +0300 Subject: [PATCH 6/9] revert utils --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index c775a34cf..b9f1eb07b 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit c775a34cf37ce874a74958f5ac63e170f174f9ab +Subproject commit b9f1eb07b9768342d18dfc8859d7e32210cba7c7 From 5ba9e71ba00da659bdc4eb3776b1926bccd3c6dd Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Mon, 17 Apr 2023 11:28:33 +0300 Subject: [PATCH 7/9] remove --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 88f998dc9..a3a824d85 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==23.1 +packaging==21.2 pyelftools==0.28 curlify==2.2.1 retry==0.9.2 From f86db70b22b237175a729222dbeb26bd9b7ff930 Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Mon, 17 Apr 2023 11:53:16 +0300 Subject: [PATCH 8/9] upgrade packaging --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 04230f692d0fc08122aaf904999c1cdcf582c9cb Mon Sep 17 00:00:00 2001 From: Yonatan Goldschmidt Date: Mon, 17 Apr 2023 11:59:14 +0300 Subject: [PATCH 9/9] upgrade --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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