From fff82552a79648f51e7e02bb491702440310fbcf Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Sun, 6 Apr 2025 14:10:17 -0400 Subject: [PATCH 1/3] Create a build project directory --- .github/dependabot.yml | 2 +- .github/workflows/release.yml | 2 +- MANIFEST.in | 6 +++--- build-project/.python-version | 1 + build-project.py => build-project/build-project.py | 0 .../build-requirements.in | 0 .../build-requirements.txt | 0 noxfile.py | 2 +- 8 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 build-project/.python-version rename build-project.py => build-project/build-project.py (100%) rename build-requirements.in => build-project/build-requirements.in (100%) rename build-requirements.txt => build-project/build-requirements.txt (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 456596841a9..d8e12fbdf6e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,6 @@ updates: patterns: - "*" - package-ecosystem: "pip" - directory: "/" + directory: "/build-project" schedule: interval: "weekly" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7d7755cd4a..d7d76f5d7d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: with: persist-credentials: false - name: Build a binary wheel and a source tarball - run: ./build-project.py + run: ./build-project/build-project.py - name: Store the distribution packages uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4 with: diff --git a/MANIFEST.in b/MANIFEST.in index cb8e14df96b..8a1c5c6f109 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,9 +5,9 @@ include README.rst include SECURITY.md include pyproject.toml -include build-requirements.in -include build-requirements.txt -include build-project.py +include build-project/build-requirements.in +include build-project/build-requirements.txt +include build-project/build-project.py include src/pip/_vendor/README.rst include src/pip/_vendor/vendor.txt diff --git a/build-project/.python-version b/build-project/.python-version new file mode 100644 index 00000000000..e4fba218358 --- /dev/null +++ b/build-project/.python-version @@ -0,0 +1 @@ +3.12 diff --git a/build-project.py b/build-project/build-project.py similarity index 100% rename from build-project.py rename to build-project/build-project.py diff --git a/build-requirements.in b/build-project/build-requirements.in similarity index 100% rename from build-requirements.in rename to build-project/build-requirements.in diff --git a/build-requirements.txt b/build-project/build-requirements.txt similarity index 100% rename from build-requirements.txt rename to build-project/build-requirements.txt diff --git a/noxfile.py b/noxfile.py index 57f5e897d63..d37c9a94766 100644 --- a/noxfile.py +++ b/noxfile.py @@ -374,7 +374,7 @@ def build_dists(session: nox.Session) -> List[str]: ) session.log("# Build distributions") - session.run("python", "build-project.py", silent=True) + session.run("python", "build-project/build-project.py", silent=True) produced_dists = glob.glob("dist/*") session.log(f"# Verify distributions: {', '.join(produced_dists)}") From e3e0abff24cd60d2d03d899b4daa17134121c103 Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Sun, 6 Apr 2025 14:21:22 -0400 Subject: [PATCH 2/3] Add ".python-version" to manifest --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 8a1c5c6f109..95e966d9624 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,6 +8,7 @@ include pyproject.toml include build-project/build-requirements.in include build-project/build-requirements.txt include build-project/build-project.py +include build-project/.python-version include src/pip/_vendor/README.rst include src/pip/_vendor/vendor.txt From 4021f2de546f77b438f83b8b849fe449d8f4946d Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Sun, 6 Apr 2025 14:53:14 -0400 Subject: [PATCH 3/3] Set cwd=Path(__file__).parent.parent in build project build call --- build-project/build-project.py | 1 + 1 file changed, 1 insertion(+) diff --git a/build-project/build-project.py b/build-project/build-project.py index 2108669ca6f..3bfa764c097 100755 --- a/build-project/build-project.py +++ b/build-project/build-project.py @@ -64,6 +64,7 @@ def main() -> None: ], check=True, env={"SOURCE_DATE_EPOCH": get_git_head_timestamp()}, + cwd=Path(__file__).parent.parent, )