Skip to content

Commit 4e31045

Browse files
authored
Merge branch 'pypa:main' into joe/warm_cache_in_threadpool
2 parents e491f93 + ea727e4 commit 4e31045

File tree

119 files changed

+3383
-1645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+3383
-1645
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.

.pre-commit-config.yaml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,11 @@ repos:
2121
hooks:
2222
- id: black
2323

24-
- repo: https://github.com/PyCQA/flake8
25-
rev: 6.0.0
24+
- repo: https://github.com/astral-sh/ruff-pre-commit
25+
# Ruff version.
26+
rev: v0.0.270
2627
hooks:
27-
- id: flake8
28-
additional_dependencies: [
29-
'flake8-bugbear',
30-
'flake8-logging-format',
31-
'flake8-implicit-str-concat',
32-
]
33-
exclude: tests/data
34-
35-
- repo: https://github.com/PyCQA/isort
36-
rev: 5.12.0
37-
hooks:
38-
- id: isort
39-
files: \.py$
28+
- id: ruff
4029

4130
- repo: https://github.com/pre-commit/mirrors-mypy
4231
rev: v0.961

NEWS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Deprecations and Removals
5353
``--config-settings``. (`#11859 <https://github.com/pypa/pip/issues/11859>`_)
5454
- Using ``--config-settings`` with projects that don't have a ``pyproject.toml`` now prints
5555
a deprecation warning. In the future the presence of config settings will automatically
56-
enable the default build backend for legacy projects and pass the setttings to it. (`#11915 <https://github.com/pypa/pip/issues/11915>`_)
56+
enable the default build backend for legacy projects and pass the settings to it. (`#11915 <https://github.com/pypa/pip/issues/11915>`_)
5757
- Remove ``setup.py install`` fallback when building a wheel failed for projects without
5858
``pyproject.toml``. (`#8368 <https://github.com/pypa/pip/issues/8368>`_)
5959
- When the ``wheel`` package is not installed, pip now uses the default build backend

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/12067.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fail with an error if the ``--python`` option is specified after the subcommand name.

0 commit comments

Comments
 (0)