Skip to content

Commit cc79232

Browse files
authored
[psutil] Bump psutil to 7.1.1 (#14873)
1 parent 3e1b90b commit cc79232

File tree

9 files changed

+21
-16
lines changed

9 files changed

+21
-16
lines changed

stubs/psutil/@tests/stubtest_allowlist_darwin.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ psutil._pslinux
22
psutil._psutil_linux
33
psutil._psutil_windows
44
psutil._pswindows
5+
6+
# not always available on ARM64, but we test there
7+
psutil.cpu_freq
8+
psutil._psosx.cpu_freq

stubs/psutil/METADATA.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "7.0.*"
1+
version = "7.1.1"
22
upstream_repository = "https://github.com/giampaolo/psutil"
33

44
[tool.stubtest]

stubs/psutil/psutil/_psbsd.pyi

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ PROC_STATUSES: Incomplete
2121
TCP_STATUSES: Incomplete
2222
PAGESIZE: Incomplete
2323
AF_LINK: Incomplete
24-
HAS_PER_CPU_TIMES: Incomplete
2524
HAS_PROC_NUM_THREADS: Incomplete
26-
HAS_PROC_OPEN_FILES: Incomplete
27-
HAS_PROC_NUM_FDS: Incomplete
2825
kinfo_proc_map: Incomplete
2926

3027
class svmem(NamedTuple):
@@ -108,6 +105,10 @@ def sensors_temperatures(): ...
108105
def cpu_freq(): ...
109106
def boot_time(): ...
110107
def users(): ...
108+
109+
INIT_BOOT_TIME: float
110+
111+
def adjust_proc_create_time(ctime: float) -> float: ...
111112
def pids(): ...
112113
def pid_exists(pid): ...
113114
def is_zombie(pid): ...
@@ -132,7 +133,7 @@ class Process:
132133
def cpu_num(self): ...
133134
def memory_info(self): ...
134135
memory_full_info: Incomplete
135-
def create_time(self): ...
136+
def create_time(self, monotonic: bool = False) -> float: ...
136137
def num_threads(self): ...
137138
def num_ctx_switches(self): ...
138139
def threads(self): ...

stubs/psutil/psutil/_pslinux.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ HAS_PROC_IO_PRIORITY: Incomplete
2424
HAS_CPU_AFFINITY: Incomplete
2525
CLOCK_TICKS: Incomplete
2626
PAGESIZE: Incomplete
27-
BOOT_TIME: Incomplete
2827
LITTLE_ENDIAN: Incomplete
28+
UNSET: object
2929
DISK_SECTOR_SIZE: int
3030
AF_LINK: Incomplete
3131
AddressFamily: Incomplete
@@ -213,7 +213,7 @@ class Process:
213213
def cpu_times(self): ...
214214
def cpu_num(self): ...
215215
def wait(self, timeout: Incomplete | None = ...): ...
216-
def create_time(self): ...
216+
def create_time(self, monotonic: bool = False) -> float: ...
217217
def memory_info(self): ...
218218
def memory_full_info(self): ...
219219
def memory_maps(self): ...

stubs/psutil/psutil/_psosx.pyi

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ if sys.platform == "darwin":
1111
ZombieProcess as ZombieProcess,
1212
conn_tmap as conn_tmap,
1313
conn_to_ntuple as conn_to_ntuple,
14+
debug as debug,
1415
isfile_strict as isfile_strict,
1516
memoize_when_activated as memoize_when_activated,
1617
parse_environ_block as parse_environ_block,
@@ -70,23 +71,21 @@ if sys.platform == "darwin":
7071

7172
disk_usage = _psposix.disk_usage
7273
disk_io_counters = _psutil_osx.disk_io_counters
73-
7474
def disk_partitions(all: bool = False) -> list[_common.sdiskpart]: ...
7575
def sensors_battery() -> _common.sbattery | None: ...
7676

7777
net_io_counters = _psutil_osx.net_io_counters
7878
net_if_addrs = _psutil_posix.net_if_addrs
79-
8079
def net_connections(kind: str = "inet") -> list[_common.sconn]: ...
8180
def net_if_stats() -> dict[str, _common.snicstats]: ...
8281
def boot_time() -> float: ...
82+
INIT_BOOT_TIME: float
83+
def adjust_proc_create_time(ctime: float) -> float: ...
8384
def users() -> list[_common.suser]: ...
8485
def pids() -> list[int]: ...
85-
8686
pid_exists = _psposix.pid_exists
87-
88-
def is_zombie(pid: int) -> bool: ...
8987
def wrap_exceptions(fun: Callable[_P, _R]) -> Callable[_P, _R]: ...
88+
def is_zombie(pid: int) -> bool: ...
9089

9190
class Process:
9291
__slots__ = ["_cache", "_name", "_ppid", "pid"]
@@ -106,7 +105,7 @@ if sys.platform == "darwin":
106105
def memory_info(self) -> pmem: ...
107106
def memory_full_info(self) -> pfullmem: ...
108107
def cpu_times(self) -> _common.pcputimes: ...
109-
def create_time(self) -> float: ...
108+
def create_time(self, monotonic: bool = False) -> float: ...
110109
def num_ctx_switches(self) -> _common.pctxsw: ...
111110
def num_threads(self) -> int: ...
112111
def open_files(self) -> list[_common.popenfile]: ...

stubs/psutil/psutil/_psutil_linux.pyi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ def proc_cpu_affinity_set(*args, **kwargs): ...
1212
def proc_ioprio_get(*args, **kwargs): ...
1313
def proc_ioprio_set(*args, **kwargs): ...
1414
def set_debug(*args, **kwargs): ...
15-
def users(*args, **kwargs): ...

stubs/psutil/psutil/_psutil_osx.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ if sys.platform == "darwin":
5353
def disk_io_counters() -> dict[str, tuple[int, int, int, int, int, int]]: ...
5454
def disk_partitions() -> list[tuple[str, str, str, str]]: ...
5555
def disk_usage_used(mount_point: StrOrBytesPath, default: _T, /) -> int | _T: ...
56+
def has_cpu_freq() -> bool: ...
5657
def net_io_counters() -> dict[str, tuple[int, int, int, int, int, int, int, int]]: ...
5758
def per_cpu_times() -> list[tuple[float, float, float, float]]: ...
5859
def pids() -> list[int]: ...
5960
def sensors_battery() -> tuple[int, int, int]: ...
6061
def swap_mem() -> tuple[int, int, int, int, int]: ...
61-
def users() -> list[tuple[str, str, str, float, int]]: ...
6262
def virtual_mem() -> tuple[int, int, int, int, int, int]: ...
6363
def check_pid_range(pid: int, /) -> None: ...
6464
def set_debug(value: bool, /) -> None: ...

stubs/psutil/psutil/_psutil_posix.pyi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import sys
2+
from _typeshed import Incomplete
23
from typing import Final
34

45
if sys.platform == "linux":
@@ -31,4 +32,5 @@ if sys.platform == "darwin":
3132
AF_LINK: Final[int]
3233
def net_if_duplex_speed(nic_name: str, /) -> list[int]: ...
3334

35+
def users() -> list[tuple[Incomplete, ...]]: ...
3436
def setpriority(pid: int, priority: int, /) -> None: ...

stubs/psutil/psutil/_psutil_windows.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if sys.platform == "win32":
6666
def proc_info(
6767
pid: int, /
6868
) -> tuple[int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int]: ...
69-
def boot_time() -> float: ...
69+
def uptime() -> float: ...
7070
def cpu_count_cores() -> int | None: ...
7171
def cpu_count_logical() -> int | None: ...
7272
def cpu_freq() -> tuple[int, int]: ...

0 commit comments

Comments
 (0)