diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 311bd1eb3efec06e2082e57ccdb8221fc49c5ebd..631b5a03fe0378c873a795abb083abc4489869a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/doc/install.rst b/doc/install.rst index 4d37d5720be12983f01b56bc1723364064128225..42e9dee29aebb7119330032c25e55abe0022ee6e 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -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: ::