diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 690ab13b88de72e26406aee205e64a425d69d330..ab48ef56e02b014b7a791bbe5ee7e491c47d5b38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,6 +67,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: "Main Script" run: | + # untested, causes import error with Pytest >= 6.2.0 + # AK, 2020-12-13 + rm pytools/mpiwrap.py + # just a forwarding sim, causes import error with Pytest >= 6.2.0 + # AK, 2020-12-13 + rm pytools/log.py + EXTRA_INSTALL="numpy" curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh . ./build-and-test-py-project.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 463450507fc68b074a22f5b4016c4826244f5ebd..6338ef89199ca99402fddf1f297f7260d4f48ce7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,15 @@ Pytest: - script: - - py_version=3 - - export EXTRA_INSTALL="numpy" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - - ". ./build-and-test-py-project.sh" + script: | + # untested, causes import error with Pytest >= 6.2.0 + # AK, 2020-12-13 + rm pytools/mpiwrap.py + # just a forwarding shim, causes import error with Pytest >= 6.2.0 + # AK, 2020-12-13 + rm pytools/log.py + + export EXTRA_INSTALL="numpy" + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + . ./build-and-test-py-project.sh tags: - python3 except: