From 08c9f0f36936b967e0b011ba76ea27b244c73fef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jul 2026 22:03:45 +0000
Subject: [PATCH 1/2] build(deps): bump setuptools from 78.1.1 to 83.0.0

Bumps [setuptools](https://github.com/pypa/setuptools) from 78.1.1 to 83.0.0.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v78.1.1...v83.0.0)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-version: 83.0.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5abaf6c79..fbad9d5e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ psutil==7.0.0
 requests==2.33.0
 ConfigArgParse==1.7
 distro==1.9.0
-setuptools==78.1.1  # For pkg_resources
+setuptools==83.0.0  # For pkg_resources
 packaging==24.2
 pyelftools~=0.32
 curlify==2.2.1

From e26a52ceb1c0f9202d45422f660baf4b854300ff Mon Sep 17 00:00:00 2001
From: Min Yeol Lim <min.yeol.lim@intel.com>
Date: Mon, 3 Aug 2026 15:29:29 -0700
Subject: [PATCH 2/2] Fix PyInstaller and mypy compatibility with setuptools
 83.0.0

- Add pkg_resources to PyInstaller hiddenimports (required since
  setuptools 81+ moved pkg_resources to a separate distribution)
- Exclude pkg_resources warning in check_pyinstaller.sh (false positive)
- Add mypy config to handle outdated pkg_resources type stubs

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 mypy.ini                     | 6 ++++++
 pyinstaller.spec             | 2 +-
 scripts/check_pyinstaller.sh | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mypy.ini b/mypy.ini
index abb6d6b3a..4883c5c31 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -13,6 +13,12 @@ warn_unused_ignores = True
 # types-setuptools
 [mypy-setuptools.*]
 ignore_missing_imports = True
+# pkg_resources is part of setuptools but has separate stubs that are outdated
+[mypy-pkg_resources.*]
+ignore_missing_imports = True
+# pkg_resources API changed in setuptools 81+ and stubs are outdated
+[mypy-gprofiler.metadata.py_module_version]
+disable_error_code = attr-defined
 # no types in package / types- package :(
 [mypy-configargparse.*]
 ignore_missing_imports = True
diff --git a/pyinstaller.spec b/pyinstaller.spec
index 03f0558f6..7c91bdfbb 100644
--- a/pyinstaller.spec
+++ b/pyinstaller.spec
@@ -6,7 +6,7 @@ a = Analysis(scripts=['pyi_build.py'],
              pathex=['/app'],
              binaries=[],
              datas=[('gprofiler/resources', 'gprofiler/resources')],
-             hiddenimports=['backports.tarfile'],
+             hiddenimports=['backports.tarfile', 'pkg_resources'],
              hookspath=[],
              runtime_hooks=[],
              excludes=['readline'],
diff --git a/scripts/check_pyinstaller.sh b/scripts/check_pyinstaller.sh
index 348b0dc3e..1aadb2642 100755
--- a/scripts/check_pyinstaller.sh
+++ b/scripts/check_pyinstaller.sh
@@ -17,7 +17,7 @@
 set -uo pipefail
 
 # grep returns 0 if a match is found and 1 if no match is found
-result=$(grep "gprofiler\." "build/pyinstaller/warn-pyinstaller.txt" | grep -v 'missing module named wmi' | grep -v 'missing module named pythoncom' | grep -v 'missing module named netifaces' | grep -v 'missing module named cpuid')
+result=$(grep "gprofiler\." "build/pyinstaller/warn-pyinstaller.txt" | grep -v 'missing module named wmi' | grep -v 'missing module named pythoncom' | grep -v 'missing module named netifaces' | grep -v 'missing module named cpuid' | grep -v 'missing module named pkg_resources')
 
 if [ -n "$result" ]; then
 	echo "$result"