Commit aa53bc79 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' of gitlab.tiker.net:inducer/ci-support

parents 129574db cce6bfde
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
echo "-----------------------------------------------"
echo "Current directory: $(pwd)"
echo "Conda environment file: ${CONDA_ENVIRONMENT}"
echo "Extra pip requirements: ${REQUIREMENTS_TXT}"
echo "PYOPENCL_TEST: ${PYOPENCL_TEST}"
echo "-----------------------------------------------"

@@ -32,6 +33,11 @@ PATH="$MINICONDA_INSTALL_DIR/bin:$PATH" conda env create --quiet --file "$CONDA_

source "$MINICONDA_INSTALL_DIR/bin/activate" testing

if test -f "$REQUIREMENTS_TXT"; then
  conda install --quiet --yes pip
  pip install -r "$REQUIREMENTS_TXT"
fi

conda install --quiet --yes pytest

# }}}