install-with-conda: use stable channel

This commit is contained in:
Sebastien Bourdeauducq 2019-11-14 17:03:26 +08:00
parent db13747279
commit b9c86ae9ec
1 changed files with 2 additions and 2 deletions

View File

@ -34,7 +34,7 @@ def run(command):
if ADD_CHANNELS: if ADD_CHANNELS:
run("conda config --prepend channels m-labs") run("conda config --prepend channels m-labs")
run("conda config --prepend channels https://conda.m-labs.hk/artiq-beta") run("conda config --prepend channels https://conda.m-labs.hk/artiq")
run("conda config --append channels conda-forge") run("conda config --append channels conda-forge")
# Creating the environment first with python 3.5 hits fewer bugs in conda's broken dependency solver. # Creating the environment first with python 3.5 hits fewer bugs in conda's broken dependency solver.
@ -42,5 +42,5 @@ run("conda create -y -n {CONDA_ENV_NAME} python=3.5".format(CONDA_ENV_NAME=CONDA
for package in CONDA_PACKAGES: for package in CONDA_PACKAGES:
# Do not activate the environment yet - otherwise "conda install" may not find the SSL module anymore on Windows. # Do not activate the environment yet - otherwise "conda install" may not find the SSL module anymore on Windows.
# Installing into the environment from the outside works around this conda bug. # Installing into the environment from the outside works around this conda bug.
run("conda install -y -n {CONDA_ENV_NAME} -c https://conda.m-labs.hk/artiq-beta {package}" run("conda install -y -n {CONDA_ENV_NAME} -c https://conda.m-labs.hk/artiq {package}"
.format(CONDA_ENV_NAME=CONDA_ENV_NAME, package=package)) .format(CONDA_ENV_NAME=CONDA_ENV_NAME, package=package))