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

Fix: Conda build-and-test script: Avoid pytest that's too new for Py2

parent d79ffa7c

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

+0 −10
Original line number Diff line number Diff line
@@ -8,16 +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_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



conda list



TESTABLES=""

build-py-project-within-miniconda.sh

+14 −0
Original line number Diff line number Diff line
@@ -72,6 +72,20 @@ fi 


# }}}



# {{{ 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



${PY_EXE} setup.py install