diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8284242f2007befa55f371368ec759d8bc2ffa7..82b4c637c4f8d9e9a72fa5c155b189d639e399cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,12 @@ jobs: run: | 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 + + CISUPPORT_PARALLEL_PYTEST=no + 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 @@ -70,7 +76,7 @@ jobs: echo "- llvm-openmp" >> .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - set -o xtrace + 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 @@ -81,8 +87,13 @@ jobs: - uses: actions/checkout@v2 - name: "Main Script" run: | - set -e CONDA_ENVIRONMENT=.test-conda-env-py3.yml + + # https://gitlab.tiker.net/inducer/pytential/-/issues/146 + echo "- _openmp_mutex=*=*gnu*" >> $CONDA_ENVIRONMENT + + CISUPPORT_PARALLEL_PYTEST=no + 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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dae0a27cd0cd0b5a7687f5ee59d1bd33c24302ee..cf9a7713fa8ea2f82a33eba781a66e8647c3c5ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,10 @@ Python 3 Conda: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - 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: diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index cb1f9027bcaee157cdde0f9983f94895cc2ae2ab..6c840cd81ca44dc9688ec7c437a729792bb78858 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -15,12 +15,3 @@ dependencies: - pyfmmlib - cython - gmsh - -- pip -- pip: - - git+https://github.com/inducer/pytools - - git+https://gitlab.tiker.net/inducer/boxtree - - git+https://github.com/inducer/pymbolic - - git+https://github.com/inducer/loopy - - git+https://github.com/inducer/sumpy - - git+https://github.com/inducer/meshmode diff --git a/requirements.txt b/requirements.txt index 09d1ec0d7ac443491cbb98c0862231f9d73ff41d..b3a861ca2b07e8f372b1ff58d4aeedcc1a192f05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ numpy -git+git://github.com/inducer/pytools -git+git://github.com/inducer/pymbolic +git+git://github.com/inducer/pytools#egg=pytools +git+git://github.com/inducer/pymbolic#egg=pymbolic sympy==1.1.1 -git+https://github.com/inducer/modepy -git+https://github.com/inducer/pyopencl -git+https://github.com/inducer/islpy -git+https://github.com/inducer/loopy -git+https://github.com/inducer/boxtree -git+https://github.com/inducer/meshmode -git+https://github.com/inducer/sumpy -git+https://github.com/inducer/pyfmmlib +git+https://github.com/inducer/modepy#egg=modepy +git+https://github.com/inducer/pyopencl#egg=pyopencl +git+https://github.com/inducer/islpy#egg=islpy +git+https://github.com/inducer/loopy#egg=loo.py +git+https://github.com/inducer/boxtree#egg=boxtree +git+https://github.com/inducer/meshmode#egg=meshmode +git+https://github.com/inducer/sumpy#egg=sumpy +git+https://github.com/inducer/pyfmmlib#egg=pyfmmlib