Skip to content

Commit 997f92a

Browse files
authored
Merge branch 'main' into strict-optional-glibc
2 parents b5377ae + b88adde commit 997f92a

File tree

23 files changed

+290
-113
lines changed

23 files changed

+290
-113
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -167,24 +167,13 @@ jobs:
167167
with:
168168
python-version: ${{ matrix.python }}
169169

170-
# We use a RAMDisk on Windows, since filesystem IO is a big slowdown
171-
# for our tests.
172-
- name: Create a RAMDisk
173-
run: ./tools/ci/New-RAMDisk.ps1 -Drive R -Size 1GB
174-
175-
- name: Setup RAMDisk permissions
176-
run: |
177-
mkdir R:\Temp
178-
$acl = Get-Acl "R:\Temp"
179-
$rule = New-Object System.Security.AccessControl.FileSystemAccessRule(
180-
"Everyone", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow"
181-
)
182-
$acl.AddAccessRule($rule)
183-
Set-Acl "R:\Temp" $acl
184-
170+
# We use C:\Temp (which is already available on the worker)
171+
# as a temporary directory for all of the tests because the
172+
# default value (under the user dir) is more deeply nested
173+
# and causes tests to fail with "path too long" errors.
185174
- run: pip install nox
186175
env:
187-
TEMP: "R:\\Temp"
176+
TEMP: "C:\\Temp"
188177

189178
# Main check
190179
- name: Run unit tests
@@ -194,7 +183,7 @@ jobs:
194183
-m unit
195184
--verbose --numprocesses auto --showlocals
196185
env:
197-
TEMP: "R:\\Temp"
186+
TEMP: "C:\\Temp"
198187

199188
- name: Run integration tests (group 1)
200189
if: matrix.group == 1
@@ -203,7 +192,7 @@ jobs:
203192
-m integration -k "not test_install"
204193
--verbose --numprocesses auto --showlocals
205194
env:
206-
TEMP: "R:\\Temp"
195+
TEMP: "C:\\Temp"
207196

208197
- name: Run integration tests (group 2)
209198
if: matrix.group == 2
@@ -212,7 +201,7 @@ jobs:
212201
-m integration -k "test_install"
213202
--verbose --numprocesses auto --showlocals
214203
env:
215-
TEMP: "R:\\Temp"
204+
TEMP: "C:\\Temp"
216205

217206
tests-zipapp:
218207
name: tests / zipapp

.github/workflows/no-response.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

news/11847.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Prevent downloading files twice when PEP 658 metadata is present

news/11920.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add permission check before configuration

news/11996.process.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Deprecate support for eggs for Python 3.11 or later, when the new ``importlib.metadata`` backend is used to load distribution metadata. This only affects the egg *distribution format* (with the ``.egg`` extension); distributions using the ``.egg-info`` *metadata format* (but are not actually eggs) are not affected. For more information about eggs, see `relevant section in the setuptools documentation <https://setuptools.pypa.io/en/stable/deprecated/python_eggs.html>`__.

news/12042.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Correctly parse ``dist-info-metadata`` values from JSON-format index data.

news/12063.removal.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Deprecate legacy version and version specifiers that don't conform to `PEP 440
2+
<https://peps.python.org/pep-0440/>`_

news/12119.bugfix.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Pass the ``-r`` flag to mercurial to be explicit that a revision is passed and protect
2+
against ``hg`` options injection as part of VCS URLs. Users that do not have control on
3+
VCS URLs passed to pip are advised to upgrade.

src/pip/_internal/commands/check.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from pip._internal.operations.check import (
88
check_package_set,
99
create_package_set_from_installed,
10+
warn_legacy_versions_and_specifiers,
1011
)
1112
from pip._internal.utils.misc import write_output
1213

@@ -21,6 +22,7 @@ class CheckCommand(Command):
2122

2223
def run(self, options: Values, args: List[str]) -> int:
2324
package_set, parsing_probs = create_package_set_from_installed()
25+
warn_legacy_versions_and_specifiers(package_set)
2426
missing, conflicting = check_package_set(package_set)
2527

2628
for project_name in missing:

src/pip/_internal/commands/download.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ def run(self, options: Values, args: List[str]) -> int:
130130
self.trace_basic_info(finder)
131131

132132
requirement_set = resolver.resolve(reqs, check_supported_wheels=True)
133+
requirement_set.warn_legacy_versions_and_specifiers()
133134

134135
downloaded: List[str] = []
135136
for req in requirement_set.requirements.values():

0 commit comments

Comments
 (0)