diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b1bccb0f23c4b1a342ed7f158c4c2fc9501de23..718901e2529fa921e065cbc5f44ef23972e3594a 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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf9a7713fa8ea2f82a33eba781a66e8647c3c5ac..439c999442f535d0bbe967c46ca424247db50d01 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: