Skip to content

Commit

Permalink
Have Cbor2 version only rely on setup.py (Chia-Network#518)
Browse files Browse the repository at this point in the history
* cbor2 version should only be in setup.py

* Build and install wheels in one step on Azure
  • Loading branch information
hoffmang9 authored and Yostra committed Jan 12, 2021
1 parent 6c92c00 commit 51f8bff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
13 changes: 4 additions & 9 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,15 @@ steps:
python -m pip install --upgrade pip
pip install wheel pep517 setuptools_scm
node -v
pip install -i https://download.chia.net/simple/ miniupnpc==2.1 setproctitle==1.1.10 cbor2==5.2.0
pip install -i https://download.chia.net/simple/ miniupnpc==2.1 setproctitle==1.1.10
displayName: "Install dependencies"
- script: |
. ./activate
clang --version
pip wheel --use-pep517 --only-binary cbor2 --extra-index-url https://download.chia.net/simple/ --wheel-dir=wheels .
displayName: "Build wheels"
pip install --no-index --find-links=./wheels/ chia-blockchain
displayName: "Build and install wheels"
- task: NodeTool@0
inputs:
Expand All @@ -64,13 +65,7 @@ steps:
cd ./electron-react
npm install
npm audit fix
displayName: "Build Electron UI"
# Using wheels and release style install so no sh install.sh
- script: |
. ./activate
pip install .
displayName: "Install wheels"
displayName: "Build Electron/React UI"
# install-timelord.sh in venv
# - script: |
Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ pip install --upgrade pip
pip install wheel
#if [ "$INSTALL_PYTHON_VERSION" = "3.8" ]; then
# This remains in case there is a diversion of binary wheels
pip install --extra-index-url https://download.chia.net/simple/ miniupnpc==2.1 setproctitle==1.1.10 cbor2==5.2.0
pip install -e .
pip install --extra-index-url https://download.chia.net/simple/ miniupnpc==2.1 setproctitle==1.1.10
pip install -e . --extra-index-url https://download.chia.net/simple/

echo ""
echo "Chia blockchain install.sh complete."
Expand Down

0 comments on commit 51f8bff

Please sign in to comment.