Skip to content

Commit 062af65

Browse files
authored
Merge branch 'main' into add-docs-for-platform-and-python-version
2 parents 69ff3a3 + a0dead9 commit 062af65

File tree

98 files changed

+726
-379
lines changed

Some content is hidden

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

98 files changed

+726
-379
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ updates:
99
patterns:
1010
- "*"
1111
- package-ecosystem: "pip"
12-
directory: "/"
12+
directory: "/build-project"
1313
schedule:
1414
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,11 @@ jobs:
6363
if: github.event_name == 'pull_request'
6464

6565
packaging:
66-
name: packaging
67-
runs-on: ubuntu-22.04
66+
name: packaging / ${{ matrix.os }}
67+
runs-on: ${{ matrix.os }}
68+
strategy:
69+
matrix:
70+
os: [ubuntu-22.04, windows-latest]
6871

6972
steps:
7073
- uses: actions/checkout@v4
@@ -104,7 +107,7 @@ jobs:
104107
name: tests / ${{ matrix.python.key || matrix.python }} / ${{ matrix.os }}
105108
runs-on: ${{ matrix.os }}
106109

107-
needs: [packaging, determine-changes]
110+
needs: [determine-changes]
108111
if: >-
109112
needs.determine-changes.outputs.tests == 'true' ||
110113
github.event_name != 'pull_request'

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
with:
1616
persist-credentials: false
1717
- name: Build a binary wheel and a source tarball
18-
run: ./build-project.py
18+
run: ./build-project/build-project.py
1919
- name: Store the distribution packages
20-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
20+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
2121
with:
2222
name: python-package-distributions
2323
path: dist/
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Download all the dists
39-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
39+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4
4040
with:
4141
name: python-package-distributions
4242
path: dist/

.github/workflows/update-rtd-redirects.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Update documentation redirects
33
on:
44
push:
55
branches: [main]
6+
paths:
7+
- ".readthedocs-custom-redirects.yml"
8+
- ".readthedocs.yml"
69
schedule:
710
- cron: 0 0 * * MON # Run every Monday at 00:00 UTC
811

@@ -22,7 +25,6 @@ jobs:
2225
- uses: actions/setup-python@v5
2326
with:
2427
python-version: "3.11"
25-
- run: pip install httpx pyyaml rich
26-
- run: python tools/update-rtd-redirects.py
28+
- run: pipx run tools/update-rtd-redirects.py
2729
env:
2830
RTD_API_TOKEN: ${{ secrets.RTD_API_TOKEN }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repos:
2222
- id: black
2323

2424
- repo: https://github.com/astral-sh/ruff-pre-commit
25-
rev: v0.9.9
25+
rev: v0.11.4
2626
hooks:
2727
- id: ruff
2828
args: [--fix, --exit-non-zero-on-fix]

MANIFEST.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ include README.rst
55
include SECURITY.md
66
include pyproject.toml
77

8-
include build-requirements.in
9-
include build-requirements.txt
10-
include build-project.py
8+
include build-project/build-requirements.in
9+
include build-project/build-requirements.txt
10+
include build-project/build-project.py
11+
include build-project/.python-version
1112

1213
include src/pip/_vendor/README.rst
1314
include src/pip/_vendor/vendor.txt

build-project/.python-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.12

build-project.py renamed to build-project/build-project.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def main() -> None:
6464
],
6565
check=True,
6666
env={"SOURCE_DATE_EPOCH": get_git_head_timestamp()},
67+
cwd=Path(__file__).parent.parent,
6768
)
6869

6970

File renamed without changes.

build-requirements.txt renamed to build-project/build-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pyproject-hooks==1.2.0 \
1818
# via build
1919

2020
# The following packages are considered to be unsafe in a requirements file:
21-
setuptools==75.8.2 \
22-
--hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
23-
--hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
21+
setuptools==78.1.0 \
22+
--hash=sha256:18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54 \
23+
--hash=sha256:3e386e96793c8702ae83d17b853fb93d3e09ef82ec62722e61da5cd22376dcd8
2424
# via -r build-requirements.in

0 commit comments

Comments
 (0)