Skip to content

Upgrade dev Python packages, part 1 #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
types-beautifulsoup4==4.11.1
3 changes: 1 addition & 2 deletions gprofiler/gprofiler_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion granulate-utils
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for new black, anyway in gProfiler code we use only packaging.version.Version which I suppose continues to function properly.

pyelftools==0.28
curlify==2.2.1
retry==0.9.2
Expand Down
1 change: 0 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
4 changes: 3 additions & 1 deletion tests/test_app_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
1 change: 0 additions & 1 deletion tests/test_java.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down