[Python-checkins] gh-114965: Updated bundled pip to 24.0 (gh-114966)

2024-02-03 Thread pfmoore 
https://github.com/python/cpython/commit/a4c298c1494b602a9650b597aad50b48e3fa1f41
commit: a4c298c1494b602a9650b597aad50b48e3fa1f41
branch: main
author: Stéphane Bidoul 
committer: pfmoore 
date: 2024-02-03T17:45:09Z
summary:

gh-114965: Updated bundled pip to 24.0 (gh-114966)

Updated bundled pip to 24.0

files:
A Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
D Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl
M Lib/ensurepip/__init__.py
M Misc/sbom.spdx.json

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 80ee125cfd4ed3..e8dd253bb55520 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "23.3.2"
+_PIP_VERSION = "24.0"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
similarity index 83%
rename from Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
index ae78b8a6ce0737..2e6aa9d2cb9923 100644
Binary files a/Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst 
b/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
new file mode 100644
index 00..d59ff991993792
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
@@ -0,0 +1 @@
+Update bundled pip to 24.0
diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json
index 94566772338b10..e94dcb83dd4e40 100644
--- a/Misc/sbom.spdx.json
+++ b/Misc/sbom.spdx.json
@@ -1570,18 +1570,18 @@
   "fileName": "Modules/_decimal/libmpdec/vcdiv64.asm"
 },
 {
-  "SPDXID": 
"SPDXRef-FILE-Lib-ensurepip-bundled-pip-23.3.2-py3-none-any.whl",
+  "SPDXID": "SPDXRef-FILE-Lib-ensurepip-bundled-pip-24.0-py3-none-any.whl",
   "checksums": [
 {
   "algorithm": "SHA1",
-  "checksumValue": "8e48f55ab2965ee64bd55cc91a8077d184a33e30"
+  "checksumValue": "e44313ae1e6af3c2bd3b60ab2fa8c34308d00555"
 },
 {
   "algorithm": "SHA256",
-  "checksumValue": 
"5052d7889c1f9d05224cd41741acb7c5d6fa735ab34e339624a614eaaa7e7d76"
+  "checksumValue": 
"ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc"
 }
   ],
-  "fileName": "Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl"
+  "fileName": "Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl"
 }
   ],
   "packages": [
@@ -1742,21 +1742,21 @@
   "checksums": [
 {
   "algorithm": "SHA256",
-  "checksumValue": 
"f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"
+  "checksumValue": 
"034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784"
 }
   ],
-  "downloadLocation": 
"https://files.pythonhosted.org/packages/76/cb/6bbd2b10170ed991cf64e8c8b85e01f2fb38f95d1bc77617569e0b0b26ac/distlib-0.3.6-py2.py3-none-any.whl";,
+  "downloadLocation": 
"https://files.pythonhosted.org/packages/8e/41/9307e4f5f9976bc8b7fea0b66367734e8faf3ec84bc0d412d8cfabbb66cd/distlib-0.3.8-py2.py3-none-any.whl";,
   "externalRefs": [
 {
   "referenceCategory": "PACKAGE_MANAGER",
-  "referenceLocator": "pkg:pypi/[email protected]",
+  "referenceLocator": "pkg:pypi/[email protected]",
   "referenceType": "purl"
 }
   ],
   "licenseConcluded": "MIT",
   "name": "distlib",
   "primaryPackagePurpose": "SOURCE",
-  "versionInfo": "0.3.6"
+  "versionInfo": "0.3.8"
 },
 {
   "SPDXID": "SPDXRef-PACKAGE-distro",
@@ -2204,19 +2204,19 @@
   "checksums": [
 {
   "algorithm": "SHA256",
-  "checksumValue": 
"5052d7889c1f9d05224cd41741acb7c5d6fa735ab34e339624a614eaaa7e7d76"
+  "checksumValue": 
"ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc"
 }
   ],
-  "downloadLocation": 
"https://f

[Python-checkins] [3.12] gh-114965: Updated bundled pip to 24.0 (gh-114966) (gh-114971)

2024-02-03 Thread pfmoore 
https://github.com/python/cpython/commit/f7252f6831b15c6415304e36e85917d91ca48e7c
commit: f7252f6831b15c6415304e36e85917d91ca48e7c
branch: 3.12
author: Stéphane Bidoul 
committer: pfmoore 
date: 2024-02-03T19:37:13Z
summary:

[3.12] gh-114965: Updated bundled pip to 24.0 (gh-114966) (gh-114971)

gh-114965: Updated bundled pip to 24.0 (gh-114966)

Updated bundled pip to 24.0

(cherry picked from commit a4c298c1494b602a9650b597aad50b48e3fa1f41)

files:
A Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
D Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index a09bf3201e1fb7..2ac872c25c897c 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('pip',)
-_PIP_VERSION = "23.3.2"
+_PIP_VERSION = "24.0"
 _PROJECTS = [
 ("pip", _PIP_VERSION, "py3"),
 ]
diff --git a/Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
similarity index 83%
rename from Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
index ae78b8a6ce0737..2e6aa9d2cb9923 100644
Binary files a/Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst 
b/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
new file mode 100644
index 00..d59ff991993792
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
@@ -0,0 +1 @@
+Update bundled pip to 24.0

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.11] gh-114965: Updated bundled pip to 24.0 (gh-114966) (gh-114973)

2024-02-03 Thread pfmoore 
https://github.com/python/cpython/commit/364892f6bb0c7ef6f382b617215069ad7587ed8b
commit: 364892f6bb0c7ef6f382b617215069ad7587ed8b
branch: 3.11
author: Stéphane Bidoul 
committer: pfmoore 
date: 2024-02-03T19:38:23Z
summary:

[3.11] gh-114965: Updated bundled pip to 24.0 (gh-114966) (gh-114973)

Updated bundled pip to 24.0.
(cherry picked from commit a4c298c1494b602a9650b597aad50b48e3fa1f41)

files:
A Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
D Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 16d222c6765955..165f3963a66c1e 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,7 +11,7 @@
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "65.5.0"
-_PIP_VERSION = "23.3.2"
+_PIP_VERSION = "24.0"
 _PROJECTS = [
 ("setuptools", _SETUPTOOLS_VERSION, "py3"),
 ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
similarity index 83%
rename from Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl
index ae78b8a6ce0737..2e6aa9d2cb9923 100644
Binary files a/Lib/ensurepip/_bundled/pip-23.3.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-24.0-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst 
b/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
new file mode 100644
index 00..d59ff991993792
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-02-03-17-54-17.gh-issue-114965.gHksCK.rst
@@ -0,0 +1 @@
+Update bundled pip to 24.0

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] gh-126188: Update bundled pip to 24.3.1 (gh-126805)

2024-11-13 Thread pfmoore 
https://github.com/python/cpython/commit/f6b0361c17552197f44be16435e4a5cb4b1d60ca
commit: f6b0361c17552197f44be16435e4a5cb4b1d60ca
branch: main
author: Stéphane Bidoul 
committer: pfmoore 
date: 2024-11-13T20:58:57Z
summary:

gh-126188: Update bundled pip to 24.3.1 (gh-126805)

Update bundled pip to 24.3.1

files:
A Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
D Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 585afc85836c06..645ad998129348 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "24.2"
+_PIP_VERSION = "24.3.1"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
similarity index 84%
rename from Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
index 542cdd1e7284ae..5f1d35be6dd56b 100644
Binary files a/Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst 
b/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
new file mode 100644
index 00..bb13662e6ae62c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
@@ -0,0 +1 @@
+Update bundled pip to 24.3.1

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.13] gh-126188: Update bundled pip to 24.3.1 (gh-126805) (#126806)

2024-11-13 Thread pfmoore 
https://github.com/python/cpython/commit/942f807f7001a28b7903d065490f601adc5ffa77
commit: 942f807f7001a28b7903d065490f601adc5ffa77
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: pfmoore 
date: 2024-11-13T21:51:57Z
summary:

[3.13] gh-126188: Update bundled pip to 24.3.1 (gh-126805) (#126806)

gh-126188: Update bundled pip to 24.3.1 (gh-126805)

Update bundled pip to 24.3.1
(cherry picked from commit f6b0361c17552197f44be16435e4a5cb4b1d60ca)

Co-authored-by: Stéphane Bidoul 

files:
A Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
D Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index c5350df270487a..df0685b1989681 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "24.2"
+_PIP_VERSION = "24.3.1"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
similarity index 84%
rename from Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
index 542cdd1e7284ae..5f1d35be6dd56b 100644
Binary files a/Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst 
b/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
new file mode 100644
index 00..bb13662e6ae62c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
@@ -0,0 +1 @@
+Update bundled pip to 24.3.1

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.12] gh-126188: Update bundled pip to 24.3.1 (gh-126805) (gh-126813)

2024-11-13 Thread pfmoore 
https://github.com/python/cpython/commit/87b3318229cffac78b9b3fd0fb225fa78f4ab190
commit: 87b3318229cffac78b9b3fd0fb225fa78f4ab190
branch: 3.12
author: Stéphane Bidoul 
committer: pfmoore 
date: 2024-11-13T23:42:54Z
summary:

[3.12] gh-126188: Update bundled pip to 24.3.1 (gh-126805) (gh-126813)

Update bundled pip to 24.3.1
(cherry picked from commit f6b0361c17552197f44be16435e4a5cb4b1d60ca)

files:
A Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
D Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index a7c8457238276b..35d04d2f8b8d7f 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('pip',)
-_PIP_VERSION = "24.2"
+_PIP_VERSION = "24.3.1"
 _PROJECTS = [
 ("pip", _PIP_VERSION, "py3"),
 ]
diff --git a/Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
similarity index 84%
rename from Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl
index 542cdd1e7284ae..5f1d35be6dd56b 100644
Binary files a/Lib/ensurepip/_bundled/pip-24.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst 
b/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
new file mode 100644
index 00..bb13662e6ae62c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-13-20-03-18.gh-issue-126188.RJLKk-.rst
@@ -0,0 +1 @@
+Update bundled pip to 24.3.1

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] gh-132933: zipapp - apply the filter when creating the list of files to add (gh-132934)

2025-04-29 Thread pfmoore 
https://github.com/python/cpython/commit/698c6e3a0cdbff4150674b0b831cf1ef27efecc8
commit: 698c6e3a0cdbff4150674b0b831cf1ef27efecc8
branch: main
author: Johannes Holmberg 
committer: pfmoore 
date: 2025-04-29T15:14:46+01:00
summary:

gh-132933: zipapp - apply the filter when creating the list of files to add 
(gh-132934)

files:
A Misc/NEWS.d/next/Library/2025-04-25-21-41-45.gh-issue-132933.yO3ySJ.rst
M Lib/test/test_zipapp.py
M Lib/zipapp.py

diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py
index ad132839622f48..d4766c59a102db 100644
--- a/Lib/test/test_zipapp.py
+++ b/Lib/test/test_zipapp.py
@@ -113,6 +113,19 @@ def test_target_overwrites_source_file(self):
 with self.assertRaises(zipapp.ZipAppError):
 zipapp.create_archive(source, target)
 
+def test_target_overwrites_filtered_source_file(self):
+# If there's a filter that excludes the target,
+# the overwrite check shouldn't trigger.
+source = self.tmpdir
+(source / '__main__.py').touch()
+target = source / 'target.pyz'
+target.touch()
+pyz_filter = lambda p: not p.match('*.pyz')
+zipapp.create_archive(source, target, filter=pyz_filter)
+with zipfile.ZipFile(target, 'r') as z:
+self.assertEqual(len(z.namelist()), 1)
+self.assertIn('__main__.py', z.namelist())
+
 def test_create_archive_filter_exclude_dir(self):
 # Test packing a directory and using a filter to exclude a
 # subdirectory (ensures that the path supplied to include
diff --git a/Lib/zipapp.py b/Lib/zipapp.py
index 4ffacc49fa753d..59b444075a62d0 100644
--- a/Lib/zipapp.py
+++ b/Lib/zipapp.py
@@ -134,7 +134,11 @@ def create_archive(source, target=None, interpreter=None, 
main=None,
 # Create the list of files to add to the archive now, in case
 # the target is being created in the source directory - we
 # don't want the target being added to itself
-files_to_add = sorted(source.rglob('*'))
+files_to_add = {}
+for path in sorted(source.rglob('*')):
+relative_path = path.relative_to(source)
+if filter is None or filter(relative_path):
+files_to_add[path] = relative_path
 
 # The target cannot be in the list of files to add. If it were, we'd
 # end up overwriting the source file and writing the archive into
@@ -159,10 +163,8 @@ def create_archive(source, target=None, interpreter=None, 
main=None,
 compression = (zipfile.ZIP_DEFLATED if compressed else
zipfile.ZIP_STORED)
 with zipfile.ZipFile(fd, 'w', compression=compression) as z:
-for child in files_to_add:
-arcname = child.relative_to(source)
-if filter is None or filter(arcname):
-z.write(child, arcname.as_posix())
+for path, relative_path in files_to_add.items():
+z.write(path, relative_path.as_posix())
 if main_py:
 z.writestr('__main__.py', main_py.encode('utf-8'))
 
diff --git 
a/Misc/NEWS.d/next/Library/2025-04-25-21-41-45.gh-issue-132933.yO3ySJ.rst 
b/Misc/NEWS.d/next/Library/2025-04-25-21-41-45.gh-issue-132933.yO3ySJ.rst
new file mode 100644
index 00..7d5eb3b0897200
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-04-25-21-41-45.gh-issue-132933.yO3ySJ.rst
@@ -0,0 +1 @@
+The zipapp module now applies the filter when creating the list of files to 
add, rather than waiting until the file is being added to the archive.

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] gh-132995: Upgrade bundled pip to 25.1.1 (gh-132997)

2025-05-02 Thread pfmoore 
https://github.com/python/cpython/commit/a512905e156bc09a20b171686ac129e66c13f26a
commit: a512905e156bc09a20b171686ac129e66c13f26a
branch: main
author: Paul Moore 
committer: pfmoore 
date: 2025-05-02T17:43:13+01:00
summary:

gh-132995: Upgrade bundled pip to 25.1.1 (gh-132997)

* gh-132995: Upgrade bundled pip to 25.1.1

files:
A Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst
D Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 2b10d97ec66633..6fc9f39b24cb9c 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "25.0.1"
+_PIP_VERSION = "25.1.1"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl
similarity index 67%
rename from Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl
index 8d3b0043ea5379..2fdcfbf9ff8139 100644
Binary files a/Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst 
b/Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst
new file mode 100644
index 00..21babef7ce
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst
@@ -0,0 +1 @@
+Bump the version of pip bundled in ensurepip to version 25.1.1

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.13] gh-132995: Upgrade bundled pip to 25.1.1 (gh-133308)

2025-05-02 Thread pfmoore 
https://github.com/python/cpython/commit/8a05dbe0043ad42153415f4a45785ca0c8a3eb7f
commit: 8a05dbe0043ad42153415f4a45785ca0c8a3eb7f
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: pfmoore 
date: 2025-05-02T18:26:38+01:00
summary:

[3.13] gh-132995: Upgrade bundled pip to 25.1.1 (gh-133308)

gh-132995: Upgrade bundled pip to 25.1.1 (gh-132997)

* gh-132995: Upgrade bundled pip to 25.1.1
(cherry picked from commit a512905e156bc09a20b171686ac129e66c13f26a)

Co-authored-by: Paul Moore 

files:
A Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst
D Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index fc5cadeb0a28a0..ed8157707d7604 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "25.0.1"
+_PIP_VERSION = "25.1.1"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl
similarity index 67%
rename from Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl
index 8d3b0043ea5379..2fdcfbf9ff8139 100644
Binary files a/Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-25.1.1-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst 
b/Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst
new file mode 100644
index 00..21babef7ce
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-04-26-10-54-38.gh-issue-132995.JuDF9p.rst
@@ -0,0 +1 @@
+Bump the version of pip bundled in ensurepip to version 25.1.1

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] gh-130160: use `.. program::` directive for documenting `ensurepip` CLI (gh-130253)

2025-02-18 Thread pfmoore 
https://github.com/python/cpython/commit/8cd7f8bf8d6b62f30a8bba1f968eb0c593a8781a
commit: 8cd7f8bf8d6b62f30a8bba1f968eb0c593a8781a
branch: main
author: Kanishk Pachauri 
committer: pfmoore 
date: 2025-02-18T12:09:22Z
summary:

gh-130160: use `.. program::` directive for documenting `ensurepip` CLI 
(gh-130253)

files:
M Doc/library/ensurepip.rst

diff --git a/Doc/library/ensurepip.rst b/Doc/library/ensurepip.rst
index 8dfb7ad9c95c3e..fa102c4a080103 100644
--- a/Doc/library/ensurepip.rst
+++ b/Doc/library/ensurepip.rst
@@ -43,6 +43,8 @@ when creating a virtual environment) or after explicitly 
uninstalling
 Command line interface
 --
 
+.. program:: ensurepip
+
 The command line interface is invoked using the interpreter's ``-m`` switch.
 
 The simplest possible invocation is::
@@ -61,26 +63,34 @@ By default, ``pip`` is installed into the current virtual 
environment
 active virtual environment). The installation location can be controlled
 through two additional command line options:
 
-* :samp:`--root {dir}`: Installs ``pip`` relative to the given root directory
-  rather than the root of the currently active virtual environment (if any)
-  or the default root for the current Python installation.
-* ``--user``: Installs ``pip`` into the user site packages directory rather
-  than globally for the current Python installation (this option is not
-  permitted inside an active virtual environment).
+.. option:: --root 
+
+   Installs ``pip`` relative to the given root directory rather than the root
+   of the currently active virtual environment (if any) or the default root
+   for the current Python installation.
+
+.. option:: --user
+
+   Installs ``pip`` into the user site packages directory rather than globally
+   for the current Python installation (this option is not permitted inside an
+   active virtual environment).
 
 By default, the scripts ``pipX`` and ``pipX.Y`` will be installed (where
 X.Y stands for the version of Python used to invoke ``ensurepip``). The
 scripts installed can be controlled through two additional command line
 options:
 
-* ``--altinstall``: if an alternate installation is requested, the ``pipX``
-  script will *not* be installed.
+.. option:: --altinstall
 
-* ``--default-pip``: if a "default pip" installation is requested, the
-  ``pip`` script will be installed in addition to the two regular scripts.
+   If an alternate installation is requested, the ``pipX`` script will *not* be
+   installed.
 
-Providing both of the script selection options will trigger an exception.
+.. option:: --default-pip
+
+   If a "default pip" installation is requested, the ``pip`` script will be
+   installed in addition to the two regular scripts.
 
+Providing both of the script selection options will trigger an exception.
 
 Module API
 --
@@ -136,3 +146,4 @@ Module API
   ``pip``, but other software should not assume those dependencies will
   always be present by default (as the dependencies may be removed in a
   future version of ``pip``).
+

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.13] gh-130160: use `.. program::` directive for documenting `ensurepip` CLI (gh-130253) (gh-130259)

2025-02-18 Thread pfmoore 
https://github.com/python/cpython/commit/a273543444a32158396dd2e9215bd37a7fce4fc0
commit: a273543444a32158396dd2e9215bd37a7fce4fc0
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: pfmoore 
date: 2025-02-18T12:51:33Z
summary:

[3.13] gh-130160: use `.. program::` directive for documenting `ensurepip` CLI 
(gh-130253) (gh-130259)

gh-130160: use `.. program::` directive for documenting `ensurepip` CLI 
(gh-130253)
(cherry picked from commit 8cd7f8bf8d6b62f30a8bba1f968eb0c593a8781a)

Co-authored-by: Kanishk Pachauri 

files:
M Doc/library/ensurepip.rst

diff --git a/Doc/library/ensurepip.rst b/Doc/library/ensurepip.rst
index 8dfb7ad9c95c3e..fa102c4a080103 100644
--- a/Doc/library/ensurepip.rst
+++ b/Doc/library/ensurepip.rst
@@ -43,6 +43,8 @@ when creating a virtual environment) or after explicitly 
uninstalling
 Command line interface
 --
 
+.. program:: ensurepip
+
 The command line interface is invoked using the interpreter's ``-m`` switch.
 
 The simplest possible invocation is::
@@ -61,26 +63,34 @@ By default, ``pip`` is installed into the current virtual 
environment
 active virtual environment). The installation location can be controlled
 through two additional command line options:
 
-* :samp:`--root {dir}`: Installs ``pip`` relative to the given root directory
-  rather than the root of the currently active virtual environment (if any)
-  or the default root for the current Python installation.
-* ``--user``: Installs ``pip`` into the user site packages directory rather
-  than globally for the current Python installation (this option is not
-  permitted inside an active virtual environment).
+.. option:: --root 
+
+   Installs ``pip`` relative to the given root directory rather than the root
+   of the currently active virtual environment (if any) or the default root
+   for the current Python installation.
+
+.. option:: --user
+
+   Installs ``pip`` into the user site packages directory rather than globally
+   for the current Python installation (this option is not permitted inside an
+   active virtual environment).
 
 By default, the scripts ``pipX`` and ``pipX.Y`` will be installed (where
 X.Y stands for the version of Python used to invoke ``ensurepip``). The
 scripts installed can be controlled through two additional command line
 options:
 
-* ``--altinstall``: if an alternate installation is requested, the ``pipX``
-  script will *not* be installed.
+.. option:: --altinstall
 
-* ``--default-pip``: if a "default pip" installation is requested, the
-  ``pip`` script will be installed in addition to the two regular scripts.
+   If an alternate installation is requested, the ``pipX`` script will *not* be
+   installed.
 
-Providing both of the script selection options will trigger an exception.
+.. option:: --default-pip
+
+   If a "default pip" installation is requested, the ``pip`` script will be
+   installed in addition to the two regular scripts.
 
+Providing both of the script selection options will trigger an exception.
 
 Module API
 --
@@ -136,3 +146,4 @@ Module API
   ``pip``, but other software should not assume those dependencies will
   always be present by default (as the dependencies may be removed in a
   future version of ``pip``).
+

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.12] gh-130160: use `.. program::` directive for documenting `ensurepip` CLI (gh-130253) (gh-130258)

2025-02-18 Thread pfmoore 
https://github.com/python/cpython/commit/aeefac90b7363586b34d6617d4997b8b5b9ff5bf
commit: aeefac90b7363586b34d6617d4997b8b5b9ff5bf
branch: 3.12
author: Miss Islington (bot) <[email protected]>
committer: pfmoore 
date: 2025-02-18T12:53:02Z
summary:

[3.12] gh-130160: use `.. program::` directive for documenting `ensurepip` CLI 
(gh-130253) (gh-130258)

gh-130160: use `.. program::` directive for documenting `ensurepip` CLI 
(gh-130253)
(cherry picked from commit 8cd7f8bf8d6b62f30a8bba1f968eb0c593a8781a)

Co-authored-by: Kanishk Pachauri 

files:
M Doc/library/ensurepip.rst

diff --git a/Doc/library/ensurepip.rst b/Doc/library/ensurepip.rst
index 3726028492a816..10773ee5f76cca 100644
--- a/Doc/library/ensurepip.rst
+++ b/Doc/library/ensurepip.rst
@@ -43,6 +43,8 @@ when creating a virtual environment) or after explicitly 
uninstalling
 Command line interface
 --
 
+.. program:: ensurepip
+
 The command line interface is invoked using the interpreter's ``-m`` switch.
 
 The simplest possible invocation is::
@@ -61,26 +63,34 @@ By default, ``pip`` is installed into the current virtual 
environment
 active virtual environment). The installation location can be controlled
 through two additional command line options:
 
-* :samp:`--root {dir}`: Installs ``pip`` relative to the given root directory
-  rather than the root of the currently active virtual environment (if any)
-  or the default root for the current Python installation.
-* ``--user``: Installs ``pip`` into the user site packages directory rather
-  than globally for the current Python installation (this option is not
-  permitted inside an active virtual environment).
+.. option:: --root 
+
+   Installs ``pip`` relative to the given root directory rather than the root
+   of the currently active virtual environment (if any) or the default root
+   for the current Python installation.
+
+.. option:: --user
+
+   Installs ``pip`` into the user site packages directory rather than globally
+   for the current Python installation (this option is not permitted inside an
+   active virtual environment).
 
 By default, the scripts ``pipX`` and ``pipX.Y`` will be installed (where
 X.Y stands for the version of Python used to invoke ``ensurepip``). The
 scripts installed can be controlled through two additional command line
 options:
 
-* ``--altinstall``: if an alternate installation is requested, the ``pipX``
-  script will *not* be installed.
+.. option:: --altinstall
 
-* ``--default-pip``: if a "default pip" installation is requested, the
-  ``pip`` script will be installed in addition to the two regular scripts.
+   If an alternate installation is requested, the ``pipX`` script will *not* be
+   installed.
 
-Providing both of the script selection options will trigger an exception.
+.. option:: --default-pip
+
+   If a "default pip" installation is requested, the ``pip`` script will be
+   installed in addition to the two regular scripts.
 
+Providing both of the script selection options will trigger an exception.
 
 Module API
 --
@@ -136,3 +146,4 @@ Module API
   ``pip``, but other software should not assume those dependencies will
   always be present by default (as the dependencies may be removed in a
   future version of ``pip``).
+

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.13] gh-130379: Fix incorrect zipapp logic to avoid including the target in itself (gh-130509) (gh-130791)

2025-03-03 Thread pfmoore 
https://github.com/python/cpython/commit/bc5c2b857330dc077986b9745d7c18415db9d3af
commit: bc5c2b857330dc077986b9745d7c18415db9d3af
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: pfmoore 
date: 2025-03-03T15:20:05Z
summary:

[3.13] gh-130379: Fix incorrect zipapp logic to avoid including the target in 
itself (gh-130509) (gh-130791)

gh-130379: Fix incorrect zipapp logic to avoid including the target in itself 
(gh-130509)
(cherry picked from commit 64ccbbbf367c7510090a6f5faf826a21102a8bc6)

Co-authored-by: Paul Moore 

files:
A Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst
M Lib/test/test_zipapp.py
M Lib/zipapp.py

diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py
index 00a5ed6626ddc5..ad132839622f48 100644
--- a/Lib/test/test_zipapp.py
+++ b/Lib/test/test_zipapp.py
@@ -89,6 +89,30 @@ def skip_pyc_files(path):
 self.assertIn('test.py', z.namelist())
 self.assertNotIn('test.pyc', z.namelist())
 
+def test_create_archive_self_insertion(self):
+# When creating an archive, we shouldn't
+# include the archive in the list of files to add.
+source = self.tmpdir
+(source / '__main__.py').touch()
+(source / 'test.py').touch()
+target = self.tmpdir / 'target.pyz'
+
+zipapp.create_archive(source, target)
+with zipfile.ZipFile(target, 'r') as z:
+self.assertEqual(len(z.namelist()), 2)
+self.assertIn('__main__.py', z.namelist())
+self.assertIn('test.py', z.namelist())
+
+def test_target_overwrites_source_file(self):
+# The target cannot be one of the files to add.
+source = self.tmpdir
+(source / '__main__.py').touch()
+target = source / 'target.pyz'
+target.touch()
+
+with self.assertRaises(zipapp.ZipAppError):
+zipapp.create_archive(source, target)
+
 def test_create_archive_filter_exclude_dir(self):
 # Test packing a directory and using a filter to exclude a
 # subdirectory (ensures that the path supplied to include
diff --git a/Lib/zipapp.py b/Lib/zipapp.py
index 03a214efa10a20..4ffacc49fa753d 100644
--- a/Lib/zipapp.py
+++ b/Lib/zipapp.py
@@ -131,14 +131,37 @@ def create_archive(source, target=None, interpreter=None, 
main=None,
 elif not hasattr(target, 'write'):
 target = pathlib.Path(target)
 
+# Create the list of files to add to the archive now, in case
+# the target is being created in the source directory - we
+# don't want the target being added to itself
+files_to_add = sorted(source.rglob('*'))
+
+# The target cannot be in the list of files to add. If it were, we'd
+# end up overwriting the source file and writing the archive into
+# itself, which is an error. We therefore check for that case and
+# provide a helpful message for the user.
+
+# Note that we only do a simple path equality check. This won't
+# catch every case, but it will catch the common case where the
+# source is the CWD and the target is a file in the CWD. More
+# thorough checks don't provide enough value to justify the extra
+# cost.
+
+# If target is a file-like object, it will simply fail to compare
+# equal to any of the entries in files_to_add, so there's no need
+# to add a special check for that.
+if target in files_to_add:
+raise ZipAppError(
+f"The target archive {target} overwrites one of the source files.")
+
 with _maybe_open(target, 'wb') as fd:
 _write_file_prefix(fd, interpreter)
 compression = (zipfile.ZIP_DEFLATED if compressed else
zipfile.ZIP_STORED)
 with zipfile.ZipFile(fd, 'w', compression=compression) as z:
-for child in sorted(source.rglob('*')):
+for child in files_to_add:
 arcname = child.relative_to(source)
-if filter is None or filter(arcname) and child.resolve() != 
arcname.resolve():
+if filter is None or filter(arcname):
 z.write(child, arcname.as_posix())
 if main_py:
 z.writestr('__main__.py', main_py.encode('utf-8'))
diff --git 
a/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst 
b/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst
new file mode 100644
index 00..157b2836491c1d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst
@@ -0,0 +1 @@
+The zipapp module now calculates the list of files to be added to the archive 
before creating the archive. This avoids accidentally including the target when 
it is being created in th

[Python-checkins] gh-130379: Fix incorrect zipapp logic to avoid including the target in itself (gh-130509)

2025-02-26 Thread pfmoore 
https://github.com/python/cpython/commit/64ccbbbf367c7510090a6f5faf826a21102a8bc6
commit: 64ccbbbf367c7510090a6f5faf826a21102a8bc6
branch: main
author: Paul Moore 
committer: pfmoore 
date: 2025-02-26T11:25:30Z
summary:

gh-130379: Fix incorrect zipapp logic to avoid including the target in itself 
(gh-130509)

files:
A Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst
M Lib/test/test_zipapp.py
M Lib/zipapp.py

diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py
index 00a5ed6626ddc5..ad132839622f48 100644
--- a/Lib/test/test_zipapp.py
+++ b/Lib/test/test_zipapp.py
@@ -89,6 +89,30 @@ def skip_pyc_files(path):
 self.assertIn('test.py', z.namelist())
 self.assertNotIn('test.pyc', z.namelist())
 
+def test_create_archive_self_insertion(self):
+# When creating an archive, we shouldn't
+# include the archive in the list of files to add.
+source = self.tmpdir
+(source / '__main__.py').touch()
+(source / 'test.py').touch()
+target = self.tmpdir / 'target.pyz'
+
+zipapp.create_archive(source, target)
+with zipfile.ZipFile(target, 'r') as z:
+self.assertEqual(len(z.namelist()), 2)
+self.assertIn('__main__.py', z.namelist())
+self.assertIn('test.py', z.namelist())
+
+def test_target_overwrites_source_file(self):
+# The target cannot be one of the files to add.
+source = self.tmpdir
+(source / '__main__.py').touch()
+target = source / 'target.pyz'
+target.touch()
+
+with self.assertRaises(zipapp.ZipAppError):
+zipapp.create_archive(source, target)
+
 def test_create_archive_filter_exclude_dir(self):
 # Test packing a directory and using a filter to exclude a
 # subdirectory (ensures that the path supplied to include
diff --git a/Lib/zipapp.py b/Lib/zipapp.py
index 03a214efa10a20..4ffacc49fa753d 100644
--- a/Lib/zipapp.py
+++ b/Lib/zipapp.py
@@ -131,14 +131,37 @@ def create_archive(source, target=None, interpreter=None, 
main=None,
 elif not hasattr(target, 'write'):
 target = pathlib.Path(target)
 
+# Create the list of files to add to the archive now, in case
+# the target is being created in the source directory - we
+# don't want the target being added to itself
+files_to_add = sorted(source.rglob('*'))
+
+# The target cannot be in the list of files to add. If it were, we'd
+# end up overwriting the source file and writing the archive into
+# itself, which is an error. We therefore check for that case and
+# provide a helpful message for the user.
+
+# Note that we only do a simple path equality check. This won't
+# catch every case, but it will catch the common case where the
+# source is the CWD and the target is a file in the CWD. More
+# thorough checks don't provide enough value to justify the extra
+# cost.
+
+# If target is a file-like object, it will simply fail to compare
+# equal to any of the entries in files_to_add, so there's no need
+# to add a special check for that.
+if target in files_to_add:
+raise ZipAppError(
+f"The target archive {target} overwrites one of the source files.")
+
 with _maybe_open(target, 'wb') as fd:
 _write_file_prefix(fd, interpreter)
 compression = (zipfile.ZIP_DEFLATED if compressed else
zipfile.ZIP_STORED)
 with zipfile.ZipFile(fd, 'w', compression=compression) as z:
-for child in sorted(source.rglob('*')):
+for child in files_to_add:
 arcname = child.relative_to(source)
-if filter is None or filter(arcname) and child.resolve() != 
arcname.resolve():
+if filter is None or filter(arcname):
 z.write(child, arcname.as_posix())
 if main_py:
 z.writestr('__main__.py', main_py.encode('utf-8'))
diff --git 
a/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst 
b/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst
new file mode 100644
index 00..157b2836491c1d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst
@@ -0,0 +1 @@
+The zipapp module now calculates the list of files to be added to the archive 
before creating the archive. This avoids accidentally including the target when 
it is being created in the source directory.

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

[Python-checkins] [3.14] gh-140874: Upgrade bundled pip to 25.3 (GH-140876) (gh-140881)

2025-11-01 Thread pfmoore 
https://github.com/python/cpython/commit/c7ede76d8e6d3e2ec027b76fb977e806269045c2
commit: c7ede76d8e6d3e2ec027b76fb977e806269045c2
branch: 3.14
author: Miss Islington (bot) <[email protected]>
committer: pfmoore 
date: 2025-11-01T11:21:51Z
summary:

[3.14] gh-140874: Upgrade bundled pip to 25.3 (GH-140876) (gh-140881)

gh-140874: Upgrade bundled pip to 25.3 (GH-140876)

Upgrade bundled pip to 25.3
(cherry picked from commit d440a0f96c6e87ee93810e0184068e90087af466)

Co-authored-by: Damian Shaw 

files:
A Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
A Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
D Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 4bd85990e8614a..21bbfad0fe6b3e 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "25.2"
+_PIP_VERSION = "25.3"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
similarity index 79%
rename from Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
index e14bb3f37c0ff4..755e1aa0c3dc5a 100644
Binary files a/Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst 
b/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
new file mode 100644
index 00..a48162de76b496
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
@@ -0,0 +1 @@
+Bump the version of pip bundled in ensurepip to version 25.3

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

[Python-checkins] [3.13] gh-140874: Upgrade bundled pip to 25.3 (GH-140876) (gh-140880)

2025-11-01 Thread pfmoore 
https://github.com/python/cpython/commit/9a3a1479880ef82f4da04484181097edb01ac1b6
commit: 9a3a1479880ef82f4da04484181097edb01ac1b6
branch: 3.13
author: Miss Islington (bot) <[email protected]>
committer: pfmoore 
date: 2025-11-01T12:42:15Z
summary:

[3.13] gh-140874: Upgrade bundled pip to 25.3 (GH-140876) (gh-140880)

* gh-140874: Upgrade bundled pip to 25.3 (GH-140876)

Upgrade bundled pip to 25.3
(cherry picked from commit d440a0f96c6e87ee93810e0184068e90087af466)

Co-authored-by: Damian Shaw 

* Update Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst

Co-authored-by: Stan Ulbrych <[email protected]>

-

Co-authored-by: Damian Shaw 
Co-authored-by: Paul Moore 
Co-authored-by: Stan Ulbrych <[email protected]>

files:
A Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
A Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
D Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index ab6d32478e4e40..8f916ad614284e 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "25.2"
+_PIP_VERSION = "25.3"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
similarity index 79%
rename from Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
index e14bb3f37c0ff4..755e1aa0c3dc5a 100644
Binary files a/Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst 
b/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
new file mode 100644
index 00..34b4ecb4ed12a0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
@@ -0,0 +1 @@
+Bump the version of pip bundled in :mod:`ensurepip` to version 25.3

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

[Python-checkins] gh-140874: Upgrade bundled pip to 25.3 (GH-140876)

2025-11-01 Thread pfmoore 
https://github.com/python/cpython/commit/d440a0f96c6e87ee93810e0184068e90087af466
commit: d440a0f96c6e87ee93810e0184068e90087af466
branch: main
author: Damian Shaw 
committer: pfmoore 
date: 2025-11-01T10:25:19Z
summary:

gh-140874: Upgrade bundled pip to 25.3 (GH-140876)

Upgrade bundled pip to 25.3

files:
A Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
A Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
D Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 0552cf55db15f7..f9f905f46ff09a 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 
 __all__ = ["version", "bootstrap"]
-_PIP_VERSION = "25.2"
+_PIP_VERSION = "25.3"
 
 # Directory of system wheel packages. Some Linux distribution packaging
 # policies recommend against bundling dependencies. For example, Fedora
diff --git a/Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl 
b/Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
similarity index 79%
rename from Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl
index e14bb3f37c0ff4..755e1aa0c3dc5a 100644
Binary files a/Lib/ensurepip/_bundled/pip-25.2-py3-none-any.whl and 
b/Lib/ensurepip/_bundled/pip-25.3-py3-none-any.whl differ
diff --git 
a/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst 
b/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
new file mode 100644
index 00..a48162de76b496
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-11-01-00-36-14.gh-issue-140874.eAWt3K.rst
@@ -0,0 +1 @@
+Bump the version of pip bundled in ensurepip to version 25.3

___
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]