Add wheel to workspace

.github/workflows/benchmark.yml

@@ -128,4 +128,4 @@ jobs:
 
     - name: cargo bench
       run: |
-        cargo bench --all
+        cargo bench --workspace --exclude chia_rs

.github/workflows/build-riscv64.yml

@@ -89,7 +89,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: packages
-          path: ./wheel/target/wheels/
+          path: ./target/wheels
           if-no-files-found: error
   upload:
     name: Upload to Chia PyPI
@@ -112,7 +112,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: packages
-          path: ./wheel/target/wheels/
+          path: ./target/wheels
 
       - name: Configure AWS credentials
         if: env.RELEASE == 'true'
@@ -133,8 +133,8 @@ jobs:
         if: env.RELEASE == 'true'
         shell: sh
         run: |
-          (cd wheel/target/wheels/; ls chia_rs-*.whl) > new_wheel_list
-          cat new_wheel_list | xargs -I % sh -c 'ls -l wheel/target/wheels/%'
+          (cd target/wheels/; ls chia_rs-*.whl) > new_wheel_list
+          cat new_wheel_list | xargs -I % sh -c 'ls -l target/wheels/%'
 
       - name: Choose wheels to upload
         if: env.RELEASE == 'true'
@@ -147,4 +147,4 @@ jobs:
         if: env.RELEASE == 'true'
         shell: sh
         run: |
-          cat upload_wheel_list | xargs -I % sh -c 'aws s3 cp wheel/target/wheels/% s3://download.chia.net/simple/chia-rs/'
+          cat upload_wheel_list | xargs -I % sh -c 'aws s3 cp target/wheels/% s3://download.chia.net/simple/chia-rs/'

.github/workflows/build-test.yml

@@ -191,13 +191,13 @@ jobs:
 
     - name: Install chia_rs wheel
       run: |
-        pip install --no-index --find-links wheel/target/wheels/ chia_rs
+        pip install --no-index --find-links target/wheels/ chia_rs
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
       with:
         name: packages
-        path: ./wheel/target/wheels/
+        path: ./target/wheels/
 
   check-typestubs:
     name: Check chia_rs.pyi
@@ -274,7 +274,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: packages
-        path: ./wheel/target/wheels/
+        path: ./target/wheels/
 
   fmt:
     runs-on: ubuntu-latest

.gitignore

@@ -1,2 +1,3 @@
 target/
 .idea/
+__pycache__/

Cargo.toml

@@ -1,5 +1,3 @@
-# the "wheel" crate is excluded from the workspace because pyo3 has problems with
-# "cargo test" and "cargo bench"
 [workspace]
 members = [
     "chia-bls",
@@ -20,8 +18,8 @@ members = [
     "clvm-utils/fuzz",
     "fuzz",
     "wasm",
+    "wheel",
 ]
-exclude = ["wheel"]
 
 [package]
 name = "chia"

wheel/Cargo.toml

@@ -18,15 +18,11 @@ path = "src/lib.rs"
 clvmr = "0.5.0"
 hex = "0.4.3"
 sha2 = "0.10.8"
-pyo3 = { version = "=0.19.0", features = ["extension-module", "multiple-pymethods"] }
+pyo3 = { version = "=0.19.0", features = ["multiple-pymethods"] }
 chia = { version = "=0.5.2", path = "..", features = ["py-bindings"] }
 chia-bls = { version = "=0.5.1", path = "../chia-bls", features = ["py-bindings"]  }
 chia-protocol = { version = "=0.5.1", path = "../chia-protocol", features = ["py-bindings"]  }
 chia-traits = { version = "=0.5.2", path = "../chia-traits", features = ["py-bindings"]  }
 clvm-traits = { version = "=0.5.2", path = "../clvm-traits", features = ["derive", "py-bindings"] }
 chia_py_streamable_macro = { version = "=0.5.1", path = "../chia_py_streamable_macro" }
 chia_streamable_macro = { version = "=0.3.0", path = "../chia_streamable_macro" }
-
-# See `../Cargo.toml` for more information on why this is necessary.
-[patch.crates-io]
-blst = { git = "https://github.com/supranational/blst.git", rev = "0d46eefa45fc1e57aceb42bba0e84eab3a7a9725" }

wheel/pyproject.toml

@@ -4,3 +4,4 @@ build-backend = "maturin"
 
 [tool.maturin]
 bindings = "pyo3"
+features = ["pyo3/extension-module"]