From 68de04c5e9f8bb7419542338a89eac81d4024c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 17 Jul 2020 14:23:46 -0500 Subject: [PATCH 1/2] Remove Conda OpenMP mutex in Github CI --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b1bccb0..718901e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,9 +54,6 @@ jobs: grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml - # https://gitlab.tiker.net/inducer/pytential/-/issues/146 - echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh @@ -89,9 +86,6 @@ jobs: run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml - # https://gitlab.tiker.net/inducer/pytential/-/issues/146 - echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh -- GitLab From 4fbb6fbc2ee958786ba472bbe04ac8ac0345813d Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 17 Jul 2020 14:25:40 -0500 Subject: [PATCH 2/2] Also remove the Conda mutex thing in Gitlab CI --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf9a7713..439c9994 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,9 +62,6 @@ Python 3 Conda: - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - # https://gitlab.tiker.net/inducer/pytential/-/issues/146 - - echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh - ". ./build-and-test-py-project-within-miniconda.sh" tags: -- GitLab