From ba9d26d0aca4366e4bb21f14133080fac929dac3 Mon Sep 17 00:00:00 2001 From: Earle Lowe <30607889+emlowe@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:07:54 -0700 Subject: [PATCH] Add needed items for sdist (#755) * Add needed items for sdist * add missing parts to sdist tar archive * Update cargo lock * use correct path * some debugging items * Need to cleanup directory * Add in some machete ignores --- .github/workflows/build-wheels.yml | 9 +++++++++ Cargo.lock | 2 ++ wheel/Cargo.toml | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index b28001bcb..27fd6a386 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -258,6 +258,15 @@ jobs: run: | pip install maturin maturin sdist -m wheel/Cargo.toml + cd target/wheels + dirname=`basename chia_rs*.tar.gz .tar.gz` + echo $dirname + mkdir $dirname + cp -r ../../src/ $dirname/src/ + gunzip chia_rs*.tar.gz + tar rvf chia_rs*.tar $dirname/src + gzip chia_rs*.tar + rm -rf $dirname - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/Cargo.lock b/Cargo.lock index e963b49bc..c35187a02 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -518,8 +518,10 @@ name = "chia_rs" version = "0.14.1" dependencies = [ "chia-bls 0.14.1", + "chia-client", "chia-consensus", "chia-protocol", + "chia-ssl", "clvm-utils", "clvmr", "hex", diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml index 43da8e339..f9f9946e0 100644 --- a/wheel/Cargo.toml +++ b/wheel/Cargo.toml @@ -4,7 +4,6 @@ version = "0.14.1" authors = ["Richard Kiss "] edition = "2021" license = "Apache-2.0" -license-file = "../LICENSE" description = "Code useful for implementing chia consensus." homepage = "https://github.com/Chia-Network/chia_rs" repository = "https://github.com/Chia-Network/chia_rs" @@ -21,6 +20,11 @@ path = "src/lib.rs" [package.metadata.maturin] python-source = "python" +# chia-client and chia-ssl are needed for the wheel sdist to work correctly +# ignore any errors from machete about unused dependencies +[package.metadata.cargo-machete] +ignored = ["chia-client", "chia-ssl"] + [dependencies] clvmr = { workspace = true } hex = { workspace = true } @@ -29,3 +33,5 @@ chia-consensus = { workspace = true, features = ["py-bindings"] } chia-bls = { workspace = true, features = ["py-bindings"] } chia-protocol = { workspace = true, features = ["py-bindings"] } clvm-utils = { workspace = true } +chia-ssl = { workspace = true } +chia-client = { workspace = true }