Commit 4968a8a9 authored by Matt Wala's avatar Matt Wala
Browse files

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

parents e9af53f2 48d704ca

build-and-benchmark-py-project.sh

+10 −4
Original line number Diff line number Diff line 
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-within-miniconda.sh

source build-py-project-within-miniconda.sh



# Use a stable release once https://github.com/airspeed-velocity/asv/pull/721 is released

pip install git+https://github.com/airspeed-velocity/asv#egg=asv

# Can't use v0.3 because https://github.com/airspeed-velocity/asv/pull/721 is needed

# Can't use v0.4 because of https://github.com/airspeed-velocity/asv/issues/822

pip install git+https://github.com/airspeed-velocity/asv@baeec6e096947f735ed3917ed0c2b9361366dd52#egg=asv



conda list
@@ -27,6 +28,9 @@ if [[ ! -z "$CI" ]]; then 
    cp -r ~/.$PROJECT/asv/results .asv/results

  fi

  rm -rf .asv/env

  # Fetch the master branch as git repository in gitlab ci env doesn't have it.

  git fetch origin master

  git branch master origin/master

fi



if [[ ! -f ~/.asv-machine.json ]]; then
@@ -36,8 +40,10 @@ fi 
master_commit=`git rev-parse master`

test_commit=`git rev-parse HEAD`



asv run $master_commit...$master_commit~ --skip-existing --verbose --show-stderr

asv run $test_commit...$test_commit~ --skip-existing --verbose --show-stderr

# cf. https://github.com/pandas-dev/pandas/pull/25237

# for reasoning on --launch-method=spawn

asv run $master_commit...$master_commit~ --skip-existing --verbose --show-stderr --launch-method=spawn

asv run $test_commit...$test_commit~ --skip-existing --verbose --show-stderr --launch-method=spawn



output=`asv compare $master_commit $test_commit --factor 1 -s`

echo "$output"

build-and-test-py-project-within-miniconda.sh

+0 −4
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ source build-py-project-within-miniconda.sh 


PY_EXE=python



# Using pip instead of conda here avoids ridiculous uninstall chains

# like these:https://gitlab.tiker.net/inducer/pyopencl/-/jobs/61543

${PY_EXE} -mpip install pytest



conda list



TESTABLES=""

build-py-project-within-miniconda.sh

+20 −4
Original line number Diff line number Diff line
@@ -59,18 +59,34 @@ source "$MINICONDA_INSTALL_DIR/bin/activate" testing 


# https://github.com/conda-forge/ocl-icd-feedstock/issues/11#issuecomment-456270634

rm -f .miniconda3/envs/testing/etc/OpenCL/vendors/system-*.icd

# https://gitlab.tiker.net/inducer/pytential/issues/112

rm -f .miniconda3/envs/testing/etc/OpenCL/vendors/apple.icd



# https://github.com/pypa/pip/issues/5345#issuecomment-386443351

export XDG_CACHE_HOME=$HOME/.cache/$CI_RUNNER_ID



if test -f "$REQUIREMENTS_TXT"; then

  conda install --quiet --yes pip

  pip install -r "$REQUIREMENTS_TXT"

# }}}



PY_EXE=python



# {{{ install pytest



# Using pip instead of conda here avoids ridiculous uninstall chains

# like these: https://gitlab.tiker.net/inducer/pyopencl/-/jobs/61543



PY_VER=$($PY_EXE -c 'import sys; print(".".join(str(s) for s in sys.version_info[:2]))')

if [[ "${PY_VER}" == 2* ]]; then

  $PY_EXE -mpip install "pytest<5"

else

  $PY_EXE -mpip install pytest

fi



# }}}



PY_EXE=python

if test -f "$REQUIREMENTS_TXT"; then

  conda install --quiet --yes pip

  pip install -r "$REQUIREMENTS_TXT"

fi



${PY_EXE} setup.py install