From 0a0a6ae824040d7349dd2b2471a7907b86b45074 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Fri, 6 Dec 2024 04:44:41 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A7=AA=20Allow=20CI=20to=20register?= =?UTF-8?q?=20multiple=20distributions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is necessary to allow the smoke test check uploading multiple packages. --- .github/workflows/reusable-smoke-test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-smoke-test.yml b/.github/workflows/reusable-smoke-test.yml index ac59f08..29f52d5 100644 --- a/.github/workflows/reusable-smoke-test.yml +++ b/.github/workflows/reusable-smoke-test.yml @@ -97,7 +97,12 @@ jobs: - name: Build the stub package sdist and wheel distributions run: python3 -m build - name: Register the stub package in devpi - run: twine register dist/*.tar.gz + run: | + for dist in dist/*.tar.gz + do + echo "Registering ${dist}..." + twine register "${dist}" + done env: TWINE_USERNAME: ${{ env.devpi-username }} TWINE_PASSWORD: ${{ env.devpi-password }} From ff2b051b0afcb29a320583463b190216bbf80be4 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Fri, 6 Dec 2024 04:21:39 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A7=AA=20Add=20a=20Maturin-based=20pa?= =?UTF-8?q?ckage=20to=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/reusable-smoke-test.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/reusable-smoke-test.yml b/.github/workflows/reusable-smoke-test.yml index 29f52d5..1b59efa 100644 --- a/.github/workflows/reusable-smoke-test.yml +++ b/.github/workflows/reusable-smoke-test.yml @@ -96,6 +96,24 @@ jobs: readme = "README.md" - name: Build the stub package sdist and wheel distributions run: python3 -m build + - name: Create the Rust package directory + run: mkdir -pv rust-example + - name: Initialize a Rust project + run: cargo init + working-directory: rust-example + - name: Populate the Rust package `pyproject.toml` + run: echo "$CONTENTS" > pyproject.toml + env: + CONTENTS: | + [build-system] + requires = [ + "maturin ~=1.0", + ] + build-backend = "maturin" + working-directory: rust-example + - name: Build the stub package sdist and wheel distributions + run: python3 -m build -o ../dist/ + working-directory: rust-example - name: Register the stub package in devpi run: | for dist in dist/*.tar.gz From 138a1215a3f0562a56c666c244d8f25a8e874e5b Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Thu, 5 Dec 2024 09:42:44 -0500 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=8C=F0=9F=93=A6=20Pin=20`pkginfo`?= =?UTF-8?q?=20to=20v1.12=20@=20runtime=20deps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: William Woodruff --- requirements/runtime.in | 5 +++++ requirements/runtime.txt | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/requirements/runtime.in b/requirements/runtime.in index cd43891..63d2a7d 100644 --- a/requirements/runtime.in +++ b/requirements/runtime.in @@ -1,5 +1,10 @@ twine ~= 6.0 +# NOTE: 1.12.0 and later enable support for metadata 2.4 +# NOTE: This can be dropped once twine stops using pkginfo +# Ref: https://github.com/pypa/twine/pull/1180 +pkginfo ~= 1.12.0 + # NOTE: Used to detect an ambient OIDC credential for OIDC publishing, # NOTE: as well as PEP 740 attestations. id ~= 1.0 diff --git a/requirements/runtime.txt b/requirements/runtime.txt index d50cb0a..638b3cf 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -66,8 +66,10 @@ packaging==24.1 # -r runtime.in # pypi-attestations # twine -pkginfo==1.10.0 - # via twine +pkginfo==1.12.0 + # via + # -r runtime.in + # twine platformdirs==4.2.2 # via sigstore pyasn1==0.6.0