Skip to content

Commit 1c215e4

Browse files
ydbotydbot
committed
Sync branches 260109-0051
2 parents 376e13b + da4c756 commit 1c215e4

File tree

40 files changed

+1263
-553
lines changed

40 files changed

+1263
-553
lines changed

‎contrib/python/jaraco.context/.dist-info/METADATA‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
1-
Metadata-Version: 2.1
1+
Metadata-Version: 2.4
22
Name: jaraco.context
3-
Version: 6.0.1
3+
Version: 6.0.2
44
Summary: Useful decorators and context managers
55
Author-email: "Jason R. Coombs" <jaraco@jaraco.com>
6+
License-Expression: MIT
67
Project-URL: Source, https://github.com/jaraco/jaraco.context
78
Classifier: Development Status :: 5 - Production/Stable
89
Classifier: Intended Audience :: Developers
9-
Classifier: License :: OSI Approved :: MIT License
1010
Classifier: Programming Language :: Python :: 3
1111
Classifier: Programming Language :: Python :: 3 :: Only
12-
Requires-Python: >=3.8
12+
Requires-Python: >=3.9
1313
Description-Content-Type: text/x-rst
1414
License-File: LICENSE
15-
Requires-Dist: backports.tarfile ; python_version < "3.12"
16-
Provides-Extra: doc
17-
Requires-Dist: sphinx >=3.5 ; extra == 'doc'
18-
Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc'
19-
Requires-Dist: rst.linker >=1.9 ; extra == 'doc'
20-
Requires-Dist: furo ; extra == 'doc'
21-
Requires-Dist: sphinx-lint ; extra == 'doc'
22-
Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc'
15+
Requires-Dist: backports.tarfile; python_version < "3.12"
2316
Provides-Extra: test
24-
Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test'
25-
Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test'
26-
Requires-Dist: pytest-cov ; extra == 'test'
27-
Requires-Dist: pytest-mypy ; extra == 'test'
28-
Requires-Dist: pytest-enabler >=2.2 ; extra == 'test'
29-
Requires-Dist: portend ; extra == 'test'
30-
Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'test'
17+
Requires-Dist: pytest!=8.1.*,>=6; extra == "test"
18+
Requires-Dist: jaraco.test>=5.6.0; extra == "test"
19+
Requires-Dist: portend; extra == "test"
20+
Provides-Extra: doc
21+
Requires-Dist: sphinx>=3.5; extra == "doc"
22+
Requires-Dist: jaraco.packaging>=9.3; extra == "doc"
23+
Requires-Dist: rst.linker>=1.9; extra == "doc"
24+
Requires-Dist: furo; extra == "doc"
25+
Requires-Dist: sphinx-lint; extra == "doc"
26+
Requires-Dist: jaraco.tidelift>=1.4; extra == "doc"
27+
Provides-Extra: check
28+
Requires-Dist: pytest-checkdocs>=2.4; extra == "check"
29+
Requires-Dist: pytest-ruff>=0.2.1; sys_platform != "cygwin" and extra == "check"
30+
Provides-Extra: cover
31+
Requires-Dist: pytest-cov; extra == "cover"
32+
Provides-Extra: enabler
33+
Requires-Dist: pytest-enabler>=3.4; extra == "enabler"
34+
Provides-Extra: type
35+
Requires-Dist: pytest-mypy>=1.0.1; extra == "type"
36+
Requires-Dist: mypy<1.19; platform_python_implementation == "PyPy" and extra == "type"
37+
Dynamic: license-file
3138

3239
.. image:: https://img.shields.io/pypi/v/jaraco.context.svg
3340
:target: https://pypi.org/project/jaraco.context
@@ -38,14 +45,14 @@ Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'te
3845
:target: https://github.com/jaraco/jaraco.context/actions?query=workflow%3A%22tests%22
3946
:alt: tests
4047

41-
.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
48+
.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
4249
:target: https://github.com/astral-sh/ruff
4350
:alt: Ruff
4451

4552
.. image:: https://readthedocs.org/projects/jaracocontext/badge/?version=latest
4653
:target: https://jaracocontext.readthedocs.io/en/latest/?badge=latest
4754

48-
.. image:: https://img.shields.io/badge/skeleton-2024-informational
55+
.. image:: https://img.shields.io/badge/skeleton-2025-informational
4956
:target: https://blog.jaraco.com/skeleton
5057

5158
.. image:: https://tidelift.com/badges/package/pypi/jaraco.context

‎contrib/python/jaraco.context/LICENSE‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
Permission is hereby granted, free of charge, to any person obtaining a copy
2-
of this software and associated documentation files (the "Software"), to
3-
deal in the Software without restriction, including without limitation the
4-
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
5-
sell copies of the Software, and to permit persons to whom the Software is
6-
furnished to do so, subject to the following conditions:
1+
MIT License
72

8-
The above copyright notice and this permission notice shall be included in
9-
all copies or substantial portions of the Software.
3+
Copyright (c) 2025 <copyright holders>
104

11-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
12-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
15-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
16-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
17-
IN THE SOFTWARE.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
6+
associated documentation files (the "Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
9+
following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in all copies or substantial
12+
portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
15+
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
16+
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
17+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
18+
USE OR OTHER DEALINGS IN THE SOFTWARE.

‎contrib/python/jaraco.context/README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
:target: https://github.com/jaraco/jaraco.context/actions?query=workflow%3A%22tests%22
88
:alt: tests
99

10-
.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
10+
.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
1111
:target: https://github.com/astral-sh/ruff
1212
:alt: Ruff
1313

1414
.. image:: https://readthedocs.org/projects/jaracocontext/badge/?version=latest
1515
:target: https://jaracocontext.readthedocs.io/en/latest/?badge=latest
1616

17-
.. image:: https://img.shields.io/badge/skeleton-2024-informational
17+
.. image:: https://img.shields.io/badge/skeleton-2025-informational
1818
:target: https://blog.jaraco.com/skeleton
1919

2020
.. image:: https://tidelift.com/badges/package/pypi/jaraco.context

‎contrib/python/jaraco.context/jaraco/context/__init__.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import sys
1313
import tempfile
1414
import urllib.request
15-
from typing import Iterator
16-
15+
from collections.abc import Iterator
1716

1817
if sys.version_info < (3, 12):
1918
from backports import tarfile
@@ -181,6 +180,8 @@ def repo_context(
181180
If dest_ctx is supplied, it should be a context manager
182181
to yield the target directory for the check out.
183182
183+
>>> getfixture('ensure_git')
184+
>>> getfixture('needs_internet')
184185
>>> repo = repo_context('https://github.com/jaraco/jaraco.context')
185186
>>> with repo as dest:
186187
... listing = os.listdir(dest)

‎contrib/python/jaraco.context/ya.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
PY3_LIBRARY()
44

5-
VERSION(6.0.1)
5+
VERSION(6.0.2)
66

77
LICENSE(MIT)
88

‎contrib/python/psutil/py3/.dist-info/METADATA‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: psutil
3-
Version: 7.1.3
3+
Version: 7.2.0
44
Summary: Cross-platform lib for process and system monitoring.
55
Home-page: https://github.com/giampaolo/psutil
66
Author: Giampaolo Rodola
@@ -55,7 +55,6 @@ License-File: LICENSE
5555
Provides-Extra: dev
5656
Requires-Dist: pytest ; extra == 'dev'
5757
Requires-Dist: pytest-instafail ; extra == 'dev'
58-
Requires-Dist: pytest-subtests ; extra == 'dev'
5958
Requires-Dist: pytest-xdist ; extra == 'dev'
6059
Requires-Dist: setuptools ; extra == 'dev'
6160
Requires-Dist: abi3audit ; extra == 'dev'
@@ -78,20 +77,11 @@ Requires-Dist: validate-pyproject[all] ; extra == 'dev'
7877
Requires-Dist: virtualenv ; extra == 'dev'
7978
Requires-Dist: vulture ; extra == 'dev'
8079
Requires-Dist: wheel ; extra == 'dev'
81-
Requires-Dist: colorama ; (os_name == "nt") and extra == 'dev'
82-
Requires-Dist: pyreadline ; (os_name == "nt") and extra == 'dev'
83-
Requires-Dist: pywin32 ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'dev'
84-
Requires-Dist: wheel ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'dev'
85-
Requires-Dist: wmi ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'dev'
8680
Provides-Extra: test
8781
Requires-Dist: pytest ; extra == 'test'
8882
Requires-Dist: pytest-instafail ; extra == 'test'
89-
Requires-Dist: pytest-subtests ; extra == 'test'
9083
Requires-Dist: pytest-xdist ; extra == 'test'
9184
Requires-Dist: setuptools ; extra == 'test'
92-
Requires-Dist: pywin32 ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'test'
93-
Requires-Dist: wheel ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'test'
94-
Requires-Dist: wmi ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'test'
9585

9686
| |downloads| |stars| |forks| |contributors| |coverage|
9787
| |version| |packages| |license|
@@ -508,6 +498,16 @@ Further process APIs
508498
>>> gone, alive = psutil.wait_procs(procs_list, timeout=3, callback=on_terminate)
509499
>>>
510500

501+
Heap info
502+
---------
503+
504+
.. code-block:: python
505+
506+
>>> import psutil
507+
>>> psutil.heap_info()
508+
pheap(heap_used=5177792, mmap_used=819200)
509+
>>> psutil.heap_trim()
510+
511511
Windows services
512512
----------------
513513

‎contrib/python/psutil/py3/README.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,16 @@ Further process APIs
454454
>>> gone, alive = psutil.wait_procs(procs_list, timeout=3, callback=on_terminate)
455455
>>>
456456
457+
Heap info
458+
---------
459+
460+
.. code-block:: python
461+
462+
>>> import psutil
463+
>>> psutil.heap_info()
464+
pheap(heap_used=5177792, mmap_used=819200)
465+
>>> psutil.heap_trim()
466+
457467
Windows services
458468
----------------
459469

‎contrib/python/psutil/py3/patches/99-fix-ya.make.patch‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- -DPSUTIL_WINDOWS=1
99
- -DPSUTIL_SIZEOF_PID_T=4
1010
- -DPSUTIL_MAYBE_EXTERN=extern
11-
@@ -42,50 +33,4 @@ SRCS(
11+
@@ -42,53 +33,4 @@ SRCS(
1212
- psutil/_psutil_linux.c
1313
- psutil/_psutil_osx.c
1414
- psutil/_psutil_windows.c
@@ -17,11 +17,13 @@
1717
psutil/arch/all/pids.c
1818
psutil/arch/all/str.c
1919
- psutil/arch/linux/disk.c
20+
- psutil/arch/linux/heap.c
2021
- psutil/arch/linux/mem.c
2122
- psutil/arch/linux/net.c
2223
- psutil/arch/linux/proc.c
2324
- psutil/arch/osx/cpu.c
2425
- psutil/arch/osx/disk.c
26+
- psutil/arch/osx/heap.c
2527
- psutil/arch/osx/init.c
2628
- psutil/arch/osx/mem.c
2729
- psutil/arch/osx/net.c
@@ -45,6 +47,7 @@
4547
- psutil/arch/sunos/sys.c
4648
- psutil/arch/windows/cpu.c
4749
- psutil/arch/windows/disk.c
50+
- psutil/arch/windows/heap.c
4851
- psutil/arch/windows/init.c
4952
- psutil/arch/windows/mem.c
5053
- psutil/arch/windows/net.c
@@ -59,7 +62,7 @@
5962
- psutil/arch/windows/socks.c
6063
- psutil/arch/windows/sys.c
6164
- psutil/arch/windows/wmi.c
62-
@@ -74,5 +36,99 @@ SRCS(
65+
@@ -74,5 +36,102 @@ SRCS(
6366
-PY_REGISTER(
6467
- psutil._psutil_linux
6568
- psutil._psutil_osx
@@ -74,6 +77,7 @@
7477
+ SRCS(
7578
+ psutil/_psutil_linux.c
7679
+ psutil/arch/linux/disk.c
80+
+ psutil/arch/linux/heap.c
7781
+ psutil/arch/linux/mem.c
7882
+ psutil/arch/linux/net.c
7983
+ psutil/arch/linux/proc.c
@@ -105,6 +109,7 @@
105109
+ psutil/_psutil_osx.c
106110
+ psutil/arch/osx/cpu.c
107111
+ psutil/arch/osx/disk.c
112+
+ psutil/arch/osx/heap.c
108113
+ psutil/arch/osx/init.c
109114
+ psutil/arch/osx/mem.c
110115
+ psutil/arch/osx/net.c
@@ -144,6 +149,7 @@
144149
+ psutil/_psutil_windows.c
145150
+ psutil/arch/windows/cpu.c
146151
+ psutil/arch/windows/disk.c
152+
+ psutil/arch/windows/heap.c
147153
+ psutil/arch/windows/init.c
148154
+ psutil/arch/windows/mem.c
149155
+ psutil/arch/windows/net.c

0 commit comments

Comments
 (0)