diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 1cc52fcf1..d21905ce2 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -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') }} @@ -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 @@ -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 && \ @@ -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 ) @@ -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 diff --git a/support/wheelname.py b/support/wheelname.py deleted file mode 100644 index 5b3cd7e4c..000000000 --- a/support/wheelname.py +++ /dev/null @@ -1,8 +0,0 @@ -import os -import subprocess - -wheels_files = os.listdir('target/wheels') -wheelname = list(filter(lambda x: x.endswith('whl') and 'musl' not in x, wheels_files))[0] -filename = "target/wheels/%s" % wheelname -print(filename) -subprocess.check_call(["pip", "install", filename])