From 0fbcde0d745ff9453a1ead6a60c45e20e8baffce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 17 Dec 2020 15:50:43 +0100 Subject: [PATCH] Delete symengine interop before non-symengine Gitlab CI --- .github/workflows/ci.yml | 4 ++-- .gitlab-ci.yml | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e34417..c86e19f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-python@v1 with: - python-version: '3.x' + python-version: '3.x' - name: "Main Script" run: | curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-python@v1 with: - python-version: '3.x' + python-version: '3.x' - name: "Main Script" run: | EXTRA_INSTALL="numpy sympy symengine scipy pexpect" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f44ac2f..be356b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,11 @@ Python 3: - script: - - PY_EXE=python3 - - EXTRA_INSTALL="numpy sympy pexpect" - - 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: | + PY_EXE=python3 + # pytest tries to import this, but it doesn't find symengine + rm pymbolic/interop/symengine.py + EXTRA_INSTALL="numpy sympy pexpect" + 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 - maxima -- GitLab