From 1d8a1f2905f100ea5c7ba7beaf39ebfb40891001 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 13 Dec 2020 15:50:35 -0600
Subject: [PATCH] Delete pytools.{mpiwrap,log} before Pytest CI because they
 cause import errors

---
 .github/workflows/ci.yml |  7 +++++++
 .gitlab-ci.yml           | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 690ab13..ab48ef5 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 4634505..6338ef8 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:
-- 
GitLab