Update psutil to 7.0.* (#13507)

python · Feb 17, 2025 · a640e08 · a640e08
1 parent 654d8c2
commit a640e08
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 53 deletions.
diff --git a/stubs/psutil/@tests/stubtest_allowlist.txt b/stubs/psutil/@tests/stubtest_allowlist.txt
@@ -1,15 +1,8 @@
 # TODO: missing from stub
 psutil.__all__
 psutil._common.__all__
-psutil._compat.__all__
 psutil._psposix.__all__
 
-# These super() dunders don't seem to be particularly useful,
-# and having them pop up on autocomplete suggestions would be annoying
-psutil._compat.super.__self__
-psutil._compat.super.__self_class__
-psutil._compat.super.__thisclass__
-
 # Stubtest does not support these platforms
 psutil._psaix
 psutil._psbsd

diff --git a/stubs/psutil/METADATA.toml b/stubs/psutil/METADATA.toml
@@ -1,4 +1,4 @@
-version = "6.1.*"
+version = "7.0.*"
 upstream_repository = "https://github.com/giampaolo/psutil"
 
 [tool.stubtest]

diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi
@@ -214,7 +214,6 @@ class Process:
     def cpu_percent(self, interval: float | None = None) -> float: ...
     def cpu_times(self) -> pcputimes: ...
     def memory_info(self) -> pmem: ...
-    def memory_info_ex(self) -> pmem: ...
     def memory_full_info(self) -> pfullmem: ...
     def memory_percent(self, memtype: str = "rss") -> float: ...
     def open_files(self) -> list[popenfile]: ...

diff --git a/stubs/psutil/psutil/_compat.pyi b/stubs/psutil/psutil/_compat.pyi
diff --git a/stubs/psutil/psutil/_psaix.pyi b/stubs/psutil/psutil/_psaix.pyi
@@ -13,12 +13,6 @@ from psutil._common import (
     memoize_when_activated as memoize_when_activated,
     usage_percent as usage_percent,
 )
-from psutil._compat import (
-    PY3 as PY3,
-    FileNotFoundError as FileNotFoundError,
-    PermissionError as PermissionError,
-    ProcessLookupError as ProcessLookupError,
-)
 
 __extra__all__: Incomplete
 HAS_THREADS: Incomplete

diff --git a/stubs/psutil/psutil/_pslinux.pyi b/stubs/psutil/psutil/_pslinux.pyi
@@ -15,7 +15,6 @@ from psutil._common import (
     supports_ipv6 as supports_ipv6,
     usage_percent as usage_percent,
 )
-from psutil._compat import PY3 as PY3
 
 __extra__all__: Any
 POWER_SUPPLY_PATH: str
@@ -145,8 +144,6 @@ class scputimes(NamedTuple):
     guest: float
     guest_nice: float
 
-prlimit: Any
-
 def calculate_avail_vmem(mems): ...
 def virtual_memory() -> svmem: ...
 def swap_memory(): ...

diff --git a/stubs/psutil/psutil/_pssunos.pyi b/stubs/psutil/psutil/_pssunos.pyi
@@ -14,13 +14,6 @@ from psutil._common import (
     socktype_to_enum as socktype_to_enum,
     usage_percent as usage_percent,
 )
-from psutil._compat import (
-    PY3 as PY3,
-    FileNotFoundError as FileNotFoundError,
-    PermissionError as PermissionError,
-    ProcessLookupError as ProcessLookupError,
-    b as b,
-)
 
 __extra__all__: Incomplete
 PAGE_SIZE: Incomplete

diff --git a/stubs/psutil/psutil/_pswindows.pyi b/stubs/psutil/psutil/_pswindows.pyi
@@ -6,7 +6,6 @@ from typing import Any, NamedTuple
 from psutil import _psutil_windows
 from psutil._common import (
     ENCODING as ENCODING,
-    ENCODING_ERRS as ENCODING_ERRS,
     AccessDenied as AccessDenied,
     NoSuchProcess as NoSuchProcess,
     TimeoutExpired as TimeoutExpired,
@@ -18,7 +17,6 @@ from psutil._common import (
     parse_environ_block as parse_environ_block,
     usage_percent as usage_percent,
 )
-from psutil._compat import PY3 as PY3
 from psutil._psutil_windows import (
     ABOVE_NORMAL_PRIORITY_CLASS as ABOVE_NORMAL_PRIORITY_CLASS,
     BELOW_NORMAL_PRIORITY_CLASS as BELOW_NORMAL_PRIORITY_CLASS,
@@ -116,7 +114,6 @@ class pio(NamedTuple):
     other_bytes: Any
 
 def convert_dos_path(s): ...
-def py2_strencode(s): ...
 def getpagesize(): ...
 def virtual_memory() -> svmem: ...
 def swap_memory(): ...