Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace my ad-hoc wheel finder with a proper pip invocation #60

Merged
merged 3 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
. ./activate
maturin build -i python --release --strip
# Find and install the newly built wheel
python support/wheelname.py
pip install --no-index --find-links target/wheels/ clvm_tools_rs

- name: Install clvm_tools_rs wheel
if: ${{ !startsWith(matrix.os, 'windows') }}
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
# We do it here as a hedge against changes in the python environment that might
# have happened due to pulling in the trunk versions of other packages that
# depend on clvm_tools_rs.
python support/wheelname.py
pip install --no-index --find-links target/wheels/ clvm_tools_rs
pip install clvm_rs
pip install clvm_tools
cd resources/tests && python test_clvm_step.py && python mandelbrot-cldb.py
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
cp support/install_deps.sh support/verify_compiler_version.sh chia-blockchain
(cd chia-blockchain && python -m venv venv && . venv/bin/activate && pip install --upgrade pip && \
python -m pip install maturin==1.1.0 && \
cd .. && python support/wheelname.py && \
cd .. && pip install --no-index --find-links target/wheels/ clvm_tools_rs && \
cd chia-blockchain && \
# deps for manage_clvm.py
pip install click typing_extensions chia_rs clvm && \
Expand All @@ -193,7 +193,7 @@ jobs:
run: |
python -m pip install pytest
# This script installs the wheel built during this workflow.
python support/wheelname.py
pip install --no-index --find-links wheel/target/wheels/ clvm_tools_rs
# TODO: bring in the other tests in resources/tests/cmdline/tests besides cmds_test.py
(cd resources/tests/cmdline/tests && py.test cmds_test.py )

Expand All @@ -206,13 +206,13 @@ jobs:
# Ensure we're using the sources we have. This is a hedge against
# changes made by any other step doing operations on pip.
# This script installs the wheel built during this workflow.
python support/wheelname.py
pip install --no-index --find-links wheel/target/wheels/ clvm_tools_rs
(cd resources/tests && python check-recompiles.py)

- name: Verify recompilation follows date and modification rules
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python, '3.8')
run: |
python support/wheelname.py
pip install --no-index --find-links wheel/target/wheels/ clvm_tools_rs
python resources/tests/test-clvm-recompile-behavior.py

- name: Install pytest
Expand Down
8 changes: 0 additions & 8 deletions support/wheelname.py

This file was deleted.

Loading