diff --git a/INSTALL.md b/INSTALL.md index a8b3d92f..1b1acb21 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -18,27 +18,30 @@ sh install.sh ### Debian/Ubuntu -On Ubuntu 18.04, you need python 3.7. It's not available in the default -repository, so you need to add an alternate source. You can skip this step -if you install in Ubuntu 19.x or higher. - -```bash -# for add-apt-repository -sudo apt install software-properties-common -y -sudo add-apt-repository ppa:deadsnakes/ppa -y -``` - -Install dependencies for Ubuntu 18.04 from above or Ubuntu 19.x or higher. +Install dependencies for Ubuntu 18.04, Ubuntu 19.x or newer. ```bash sudo apt-get update -sudo apt-get install python3.7-venv python3.7-dev python3-pip git -y +sudo apt-get install python3.7-venv git -y +python3.7 -m venv venv +ln -s venv/bin/activate +. ./activate +pip install --upgrade pip +pip install -i https://hosted.chia.net/simple/ miniupnpc==0.1.dev5 setproctitle==1.1.10 cbor2==5.0.1 +deactivate + +# Either checkout the source git clone https://github.com/Chia-Network/chia-blockchain.git cd chia-blockchain sh install.sh . ./activate + +# Or install chia-blockchain as a package +pip install chia-blockchain==1.0.beta2 + +. /activate ``` ### Windows (WSL) diff --git a/LINUX_TIMELORD.md b/LINUX_TIMELORD.md index 8c6007d3..418e26c7 100644 --- a/LINUX_TIMELORD.md +++ b/LINUX_TIMELORD.md @@ -1,10 +1,12 @@ The Linux chiavdf wheels are currently missing an executable required to run a timelord. -If you want to run a timelord on Linux, you must install the wheel from source (which may require -some additional packages). +If you want to run a timelord on Linux, you must install the wheel from source (which may require some additional packages) while in the virtual environment. ``` -source ./activate +. ./activate + pip install --force --no-binary chiavdf chiavdf==0.12.1 +# or +sh install-timelord.sh ``` If the compile fails, it's likely due to a missing dependency. See [INSTALL.md](INSTALL.md) to determine diff --git a/install.sh b/install.sh index 25da6a28..627b1e56 100644 --- a/install.sh +++ b/install.sh @@ -26,7 +26,7 @@ fi if [ `uname` = "Linux" ] && type apt-get; then # Debian/Ubuntu - sudo apt-get install -y npm python3-dev + sudo apt-get install -y npm fi # this fancy syntax sets INSTALL_PYTHON_PATH to "python3.7" unless INSTALL_PYTHON_VERSION is defined