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

Upgrade pytest

parent 7c2271d6

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ if [ -d test ]; then 
    ulimit -c unlimited



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

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

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



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

    # add --tb=native

build-and-test-py-project.sh

+3 −3
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ if test "$EXTRA_INSTALL" != ""; then 
  done

fi



# Pinned to 3.0.4 because of https://github.com/pytest-dev/pytest/issues/2434

$PIP install pytest==3.0.4 pytest-warnings==0.2.0

# Used to be pinned to 3.0.4 because of https://github.com/pytest-dev/pytest/issues/2434

$PIP install pytest==3.2.0



if test "$REQUIREMENTS_TXT" == ""; then

  REQUIREMENTS_TXT="requirements.txt"
@@ -125,7 +125,7 @@ if [ -d test ]; then 
    ulimit -c unlimited



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

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

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



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

    # add --tb=native