Skip to content

Commit

Permalink
Back out feature infra, as we won't be using it here
Browse files Browse the repository at this point in the history
  • Loading branch information
prozacchiwawa committed Nov 2, 2023
1 parent f77802d commit dc2823e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 37 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/build-arm64-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,13 @@ jobs:
rustup target add aarch64-unknown-linux-musl
rm -rf venv
export PATH="${PATH}:/opt/python/cp39-cp39/bin/:/opt/python/cp38-cp38/bin/:/opt/python/cp37-cp37m/bin/"
- name: Build Python wheels
run: |
/opt/python/cp38-cp38/bin/python -m venv venv
if [ ! -f "activate" ]; then ln -s venv/bin/activate; fi
. ./activate
pip install maturin==1.1.0
pip install tomlkit
USE_FEATURES=$(./support/feature-fishing.py)
echo "USE_FEATURES=${USE_FEATURES}" >> "$GITHUB_ENV"
export
CC=gcc maturin build --release --strip --manylinux 2014 "--features=extension-module,${USE_FEATURES}"
CC=gcc maturin build --release --strip --manylinux 2014
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/build-m1-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,9 @@ jobs:
python3 -m venv venv
. ./venv/bin/activate
export PATH=~/.cargo/bin:$PATH
arch -arm64 pip install tomlkit
USE_FEATURES=$(arch -arm64 ./support/feature-fishing.py)
echo "USE_FEATURES=${USE_FEATURES}" >> "$GITHUB_ENV"
arch -arm64 pip install maturin==1.1.0
arch -arm64 maturin build -i python --release --strip "--features=extension-module,${USE_FEATURES}"
echo "cargo test using features: ${USE_FEATURES}"
arch -arm64 cargo test --features="${USE_FEATURES}"
pip install maturin==1.1.0
maturin build -i python --release --strip
cargo test
- name: Install clvm_tools_rs wheel
run: |
Expand Down Expand Up @@ -106,7 +102,6 @@ jobs:
- name: Run tests from clvm_tools
run: |
. ./venv/bin/activate
arch -arm64 cargo test --features="${USE_FEATURES}"
cd clvm_tools
pytest
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@ jobs:
run: |
python -m pip install maturin==1.1.0
- name: Set up feature flags to use
shell: bash
run: |
python -m pip install tomlkit
USE_FEATURES=$(./support/feature-fishing.py)
echo "USE_FEATURES=${USE_FEATURES}" >> "$GITHUB_ENV"
- name: Build MacOs with maturin on Python ${{ matrix.python }}
if: startsWith(matrix.os, 'macos')
env:
Expand Down Expand Up @@ -154,7 +147,7 @@ jobs:
shell: bash
run: |
. ./activate
cargo build --no-default-features --features="${USE_FEATURES}"
maturin develop
cd resources/tests && \
python test_clvm_step.py && \
python mandelbrot-cldb.py
Expand All @@ -165,7 +158,7 @@ jobs:
set -x
. ./activate
# Build cmd line tools
PYO3_PYTHON=`which python` cargo build --no-default-features --features="${USE_FEATURES}" --release
PYO3_PYTHON=`which python` cargo build --release
# Grab chia-blockchain
rm -rf chia-blockchain
Expand Down Expand Up @@ -228,7 +221,7 @@ jobs:
- name: Run tests
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python, '3.8')
run: cargo test --features="${USE_FEATURES}"
run: cargo test

- name: Exhaustive assign tests
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python, '3.8')
Expand Down
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ name = "clvm_tools_rs"
crate-type = ["cdylib", "rlib"]

[features]
debug-print = []
extension-module = ["dep:pyo3"]
default = ["debug-print"]
default = []

[target.'cfg(target_family="wasm")'.dependencies]
wasm-bindgen = { version = "0.2.80", features = ["serde-serialize"] }
Expand Down
11 changes: 0 additions & 11 deletions support/feature-fishing.py

This file was deleted.

0 comments on commit dc2823e

Please sign in to comment.