Skip to content

Commit 3718bed

Browse files
committed
Update dependencies, limit python version
Remove deprecated "pkg_resources" add "importlib" to replace it.
1 parent dcfcffa commit 3718bed

File tree

3 files changed

+4283
-3812
lines changed

3 files changed

+4283
-3812
lines changed

interpreter/core/utils/system_debug_info.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import platform
22
import subprocess
33

4-
import pkg_resources
4+
from importlib.metadata import version, PackageNotFoundError
5+
from importlib.metadata import distributions
56
import psutil
67
import toml
78

@@ -25,8 +26,11 @@ def get_oi_version():
2526
)
2627
except Exception as e:
2728
oi_version_cmd = str(e)
28-
oi_version_pkg = pkg_resources.get_distribution("open-interpreter").version
29-
oi_version = oi_version_cmd, oi_version_pkg
29+
try:
30+
pkg_ver = version("open-interpreter")
31+
except PackageNotFoundError:
32+
pkg_ver = None
33+
oi_version = oi_version_cmd, pkg_ver
3034
return oi_version
3135

3236

@@ -53,8 +57,10 @@ def get_package_mismatches(file_path="pyproject.toml"):
5357
dev_dependencies = pyproject["tool"]["poetry"]["group"]["dev"]["dependencies"]
5458
dependencies.update(dev_dependencies)
5559

56-
installed_packages = {pkg.key: pkg.version for pkg in pkg_resources.working_set}
57-
60+
installed_packages = {
61+
dist.metadata["Name"].lower(): dist.version
62+
for dist in distributions()
63+
}
5864
mismatches = []
5965
for package, version_info in dependencies.items():
6066
if isinstance(version_info, dict):

0 commit comments

Comments
 (0)