Commit 200e42f8 authored by Matt Wala's avatar Matt Wala
Browse files

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

parents 2030cc21 950fc9f4

build-and-benchmark-py-project.sh

+6 −3
Original line number Diff line number Diff line
@@ -28,10 +28,13 @@ 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



  # Fetch the master branch if the git repository in the gitlab CI env does not have it.

  if ! git rev-parse --verify master > /dev/null 2>&1; then

    git fetch origin master || true

    git branch master origin/master

  fi

fi



if [[ ! -f ~/.asv-machine.json ]]; then

  asv machine --yes

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

+6 −4
Original line number Diff line number Diff line
@@ -29,14 +29,16 @@ if [ -d test ]; then 
  rm -Rf 

  if ! test -z "$TESTABLES"; then

    echo "TESTABLES: $TESTABLES"



    # Core dumps? Sure, we'll take them.

    ulimit -c unlimited



    ${PY_EXE} -m pytest -rw --durations=10 --tb=native  -rxs $TESTABLES

    # 10 GiB should be enough for just about anyone

    ulimit -m $(python -c 'print(1024*1024*10)')



    ${PY_EXE} -m pytest -rw --durations=10 --tb=native  --junitxml=pytest.xml -rxs $PYTEST_FLAGS $TESTABLES



    # Avoid https://github.com/pytest-dev/pytest/issues/754:

    # add --tb=native



    # Avoid https://github.com/pytest-dev/pytest/issues/785:

    # omit --junitxml=pytest.xml

  fi

fi

build-and-test-py-project.sh

+6 −1
Original line number Diff line number Diff line
@@ -27,9 +27,14 @@ if [ -d test ]; then 


  if ! test -z "$TESTABLES"; then

    echo "TESTABLES: $TESTABLES"



    # Core dumps? Sure, we'll take them.

    ulimit -c unlimited



    # 10 GiB should be enough for just about anyone

    ulimit -m $(python -c 'print(1024*1024*10)')



    # Need to set both _TEST and _CTX because doctests do not use _TEST.

    ${PY_EXE} -m pytest -rw --durations=10 --tb=native  --junitxml=pytest.xml -rxsw $TESTABLES

    ${PY_EXE} -m pytest -rw --durations=10 --tb=native  --junitxml=pytest.xml -rxsw $PYTEST_FLAGS $TESTABLES

  fi

fi

build-py-project-and-run-examples.sh

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ for i in $(find . -name '*.py' -exec grep -q __main__ '{}' \; -print ); do 
  echo "-----------------------------------------------------------------------"

  dn=$(dirname "$i")

  bn=$(basename "$i")

  (cd $dn; ${PY_EXE} "$bn")

  (cd $dn; time ${PY_EXE} "$bn")

done

build-py-project-within-miniconda.sh

+16 −2
Original line number Diff line number Diff line
@@ -13,18 +13,32 @@ echo "-----------------------------------------------" 


# {{{ clean up



# keep this consistent in build-py-project.sh and build-py-project-within-miniconda.sh



rm -Rf .env

rm -Rf build

find . -name '*.pyc' -delete



rm -Rf env

git clean -fdx -e siteconf.py -e boost-numeric-bindings $GIT_CLEAN_EXCLUDE

git clean -fdx \

  -e siteconf.py \

  -e boost-numeric-bindings \

  -e '.pylintrc.yml' \

  -e 'prepare-and-run-*.sh' \

  -e 'run-*.py' \

  -e '.test-*.yml' \

  $GIT_CLEAN_EXCLUDE





if test `find "siteconf.py" -mmin +1`; then

  echo "siteconf.py older than a minute, assumed stale, deleted"

  rm -f siteconf.py

fi



if [[ "$NO_SUBMODULES" = "" ]]; then

  git submodule update --init --recursive

fi



# }}}



if [ "$(uname)" = "Darwin" ]; then
@@ -88,6 +102,6 @@ if test -f "$REQUIREMENTS_TXT"; then 
  pip install -r "$REQUIREMENTS_TXT"

fi



${PY_EXE} setup.py install

pip install $PROJECT_INSTALL_FLAGS .



conda list