From 0ae871f92d43dc343b146cc2378de77d42631db1 Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Tue, 18 Mar 2025 22:53:07 +0200 Subject: [PATCH 1/8] Upgrade packages black, requests and protobuf, update granulate-utils accordingly --- dev-requirements.txt | 6 +++--- granulate-utils | 2 +- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6962087dc..74956de20 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,16 +1,16 @@ pytest==7.0.1 flake8==6.0.0 -black==23.3.0 +black==25.1.0 mypy==0.971 isort==5.12.0 PyYAML==6.0 docker==7.0.0 -types-requests==0.1.9 +types-requests~=2.32 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-protobuf~=5.29.1 types-toml==0.10.8 types-retry==0.9.9 types-beautifulsoup4==4.11.1 diff --git a/granulate-utils b/granulate-utils index dd8aa29b9..6c6ad1074 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit dd8aa29b9d68a05f55e6e1d89dfffab6879c8530 +Subproject commit 6c6ad10745153c217720a5bbeaa3a5d52ece20e4 diff --git a/requirements.txt b/requirements.txt index 6d178649e..e1e0fc350 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ importlib-resources==5.1.0 psutil==5.9.8 -requests==2.31.0 +requests==2.32.3 ConfigArgParse==1.3 distro==1.7.0 setuptools==65.5.1 # For pkg_resources From 7dba97ed10eb80239bd22b4b70c7cd5c540e752b Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Tue, 18 Mar 2025 23:00:12 +0200 Subject: [PATCH 2/8] Upgrade docker-py and matched in granulate-utils --- dev-requirements.txt | 2 +- granulate-utils | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 74956de20..e1ebd1f0d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,7 +4,7 @@ black==25.1.0 mypy==0.971 isort==5.12.0 PyYAML==6.0 -docker==7.0.0 +docker==7.1.0 types-requests~=2.32 types-dataclasses==0.6.6 types-psutil==5.8.19 diff --git a/granulate-utils b/granulate-utils index 6c6ad1074..794f3249f 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 6c6ad10745153c217720a5bbeaa3a5d52ece20e4 +Subproject commit 794f3249f481c171b505c9f1284fdbb797d24013 From fdf0dc4b0e8d0be0a3b95abc4c8c67e50393645b Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Tue, 18 Mar 2025 23:03:18 +0200 Subject: [PATCH 3/8] upgrade setuptools and matching granulate-utils --- granulate-utils | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/granulate-utils b/granulate-utils index 794f3249f..03fd53203 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 794f3249f481c171b505c9f1284fdbb797d24013 +Subproject commit 03fd532036caaddd59fd5eadd72e69b3dc1869f2 diff --git a/requirements.txt b/requirements.txt index e1e0fc350..11078a16e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ psutil==5.9.8 requests==2.32.3 ConfigArgParse==1.3 distro==1.7.0 -setuptools==65.5.1 # For pkg_resources +setuptools==76.1.0 # For pkg_resources packaging==23.1 pyelftools~=0.31 curlify==2.2.1 From 762e5f0115daeeb5325b0a686b5b4238b870b43b Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Tue, 18 Mar 2025 23:13:33 +0200 Subject: [PATCH 4/8] Upgrade mypy to match granulate-utils --- dev-requirements.txt | 2 +- gprofiler/metadata/py_module_version.py | 14 +++++++------- gprofiler/profilers/java.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index e1ebd1f0d..0aef7f0dc 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ pytest==7.0.1 flake8==6.0.0 black==25.1.0 -mypy==0.971 +mypy==1.5.1 isort==5.12.0 PyYAML==6.0 docker==7.1.0 diff --git a/gprofiler/metadata/py_module_version.py b/gprofiler/metadata/py_module_version.py index 575d907d1..4d153eea2 100644 --- a/gprofiler/metadata/py_module_version.py +++ b/gprofiler/metadata/py_module_version.py @@ -57,7 +57,7 @@ def _get_packages_dir(file_path: str) -> Optional[str]: def _get_metadata(dist: pkg_resources.Distribution) -> Dict[str, str]: """Based on pip._internal.utils.get_metadata""" metadata_name = "METADATA" - if isinstance(dist, pkg_resources.DistInfoDistribution) and dist.has_metadata(metadata_name): # type: ignore + if isinstance(dist, pkg_resources.DistInfoDistribution) and dist.has_metadata(metadata_name): metadata = dist.get_metadata(metadata_name) elif dist.has_metadata("PKG-INFO"): metadata_name = "PKG-INFO" @@ -119,8 +119,8 @@ def _files_from_legacy(dist: pkg_resources.Distribution) -> Optional[Iterator[st except (FileNotFoundError, KeyError): return None paths = (p for p in text.splitlines(keepends=False) if p) - root = dist.location - info = dist.egg_info # type: ignore + root = dist.location # type: ignore + info = dist.egg_info if root is None or info is None: return paths try: @@ -138,7 +138,7 @@ def _get_package_name(dist: pkg_resources.Distribution) -> Optional[str]: if metadata: # The metadata should NEVER be missing the Name: key, but if it somehow # does, fall back to the known canonical name. - return metadata.get("Name", dist.project_name) + return metadata.get("Name", dist.project_name) # type: ignore return None @@ -230,8 +230,8 @@ def _populate_packages_versions(packages_versions: Dict[str, Optional[Tuple[str, # This function resolves symlinks and makes paths absolute for comparison purposes which isn't required # for our usage. if hasattr(pkg_resources, "_normalize_cached"): - original__normalize_cache = pkg_resources._normalize_cached # type: ignore - pkg_resources._normalize_cached = lambda path: path # type: ignore + original__normalize_cache = pkg_resources._normalize_cached + pkg_resources._normalize_cached = lambda path: path else: global _warned_no__normalized_cached if not _warned_no__normalized_cached: @@ -261,7 +261,7 @@ def _populate_packages_versions(packages_versions: Dict[str, Optional[Tuple[str, packages_versions[module_path] = package_info finally: # Don't forget to restore the original implementation in case someone else uses this function - pkg_resources._normalize_cached = original__normalize_cache # type: ignore + pkg_resources._normalize_cached = original__normalize_cache _exceptions_logged = 0 diff --git a/gprofiler/profilers/java.py b/gprofiler/profilers/java.py index 3f1d3641d..7cdc85147 100644 --- a/gprofiler/profilers/java.py +++ b/gprofiler/profilers/java.py @@ -350,7 +350,7 @@ def get_java_version(process: Process, stop_event: Event) -> Optional[str]: def _run_java_version() -> "CompletedProcess[bytes]": return run_process( [ - cast(str, process_java_path), + cast(str, process_java_path), # type: ignore "-version", ], stop_event=stop_event, From 26e092c0b027eb2c8c0837f833ad6ce344f68c7b Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Wed, 19 Mar 2025 11:14:43 +0200 Subject: [PATCH 5/8] Lower requirements to meet python 3.8 --- dev-requirements.txt | 2 +- granulate-utils | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 0aef7f0dc..f8e291b7a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ pytest==7.0.1 flake8==6.0.0 -black==25.1.0 +black==24.8.0 mypy==1.5.1 isort==5.12.0 PyYAML==6.0 diff --git a/granulate-utils b/granulate-utils index 03fd53203..787b0f15f 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 03fd532036caaddd59fd5eadd72e69b3dc1869f2 +Subproject commit 787b0f15fdf04b6fa5415886eef9af85e5533660 diff --git a/requirements.txt b/requirements.txt index 11078a16e..9a1cca1a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ psutil==5.9.8 requests==2.32.3 ConfigArgParse==1.3 distro==1.7.0 -setuptools==76.1.0 # For pkg_resources +setuptools==75.3.2 # For pkg_resources packaging==23.1 pyelftools~=0.31 curlify==2.2.1 From d2d448da2c55f307cab092cfcf9405a8cb90ce49 Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Wed, 19 Mar 2025 11:35:38 +0200 Subject: [PATCH 6/8] Fix setuptools version for pkg_resources to support python 3.8 --- gprofiler/metadata/py_module_version.py | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gprofiler/metadata/py_module_version.py b/gprofiler/metadata/py_module_version.py index 4d153eea2..f9100a4d4 100644 --- a/gprofiler/metadata/py_module_version.py +++ b/gprofiler/metadata/py_module_version.py @@ -119,7 +119,7 @@ def _files_from_legacy(dist: pkg_resources.Distribution) -> Optional[Iterator[st except (FileNotFoundError, KeyError): return None paths = (p for p in text.splitlines(keepends=False) if p) - root = dist.location # type: ignore + root = dist.location info = dist.egg_info if root is None or info is None: return paths @@ -138,7 +138,7 @@ def _get_package_name(dist: pkg_resources.Distribution) -> Optional[str]: if metadata: # The metadata should NEVER be missing the Name: key, but if it somehow # does, fall back to the known canonical name. - return metadata.get("Name", dist.project_name) # type: ignore + return metadata.get("Name", dist.project_name) return None diff --git a/requirements.txt b/requirements.txt index 9a1cca1a4..94df731d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ psutil==5.9.8 requests==2.32.3 ConfigArgParse==1.3 distro==1.7.0 -setuptools==75.3.2 # For pkg_resources +setuptools==75.3.1 # For pkg_resources packaging==23.1 pyelftools~=0.31 curlify==2.2.1 From ed429dc10168aab66b15396784e9c6df6dda5f74 Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Wed, 19 Mar 2025 11:57:04 +0200 Subject: [PATCH 7/8] Remove typing for pkg_resources as I think not needed because of setuptools types --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index f8e291b7a..1506c348a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -9,7 +9,7 @@ types-requests~=2.32 types-dataclasses==0.6.6 types-psutil==5.8.19 types-PyYAML==6.0.3 -types-pkg-resources==0.1.3 +types-setuptools~=75.3.0 types-protobuf~=5.29.1 types-toml==0.10.8 types-retry==0.9.9 From 9128d9e1b1514e117b094c372f829fe2c8599d4d Mon Sep 17 00:00:00 2001 From: Ron Sobol Date: Wed, 19 Mar 2025 12:29:55 +0200 Subject: [PATCH 8/8] Upgrade granulate-utils to version with updated pb2 files. --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index 787b0f15f..92999cb3b 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 787b0f15fdf04b6fa5415886eef9af85e5533660 +Subproject commit 92999cb3bb380d38bb578d1fe40b2426cf8a08b7