Commit 249b1121 authored by Jaden DIEFENBAUGH's avatar Jaden DIEFENBAUGH
Browse files

Merge remote changes

parents 31c314b7 81cc324b
Pipeline #24125 passed with stages
in 27 minutes and 19 seconds
......@@ -63,12 +63,6 @@ stages:
key: "macosx-cache"
build_linux_27:
<<: *linux_build_job
variables:
PYTHON_VERSION: "2.7"
build_linux_36:
<<: *linux_build_job
variables:
......@@ -83,12 +77,6 @@ build_linux_36:
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
build_macosx_27:
<<: *macosx_build_job
variables:
PYTHON_VERSION: "2.7"
build_macosx_36:
<<: *macosx_build_job
variables:
......@@ -137,9 +125,7 @@ browser_linux_36:
script:
- ./_ci/deploy.sh
dependencies:
- build_linux_27
- build_linux_36
- build_macosx_27
- build_macosx_36
tags:
- deployer
......
......@@ -60,9 +60,13 @@ Installation Steps
------------------
#. Activate the Conda environment you will be adding ``beat.editor`` to
#. Add a new Conda channel: ::
#. Due to the current development state of this project you need to add these two Conda channels: ::
$ conda config --env --add channels https://www.idiap.ch/software/beat/conda/label/beta
$ conda config --env --add channels https://www.idiap.ch/software/beat/conda
Note: once this package released only the second channel will be required
#. Install the ``beat.editor`` package: ::
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment