diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f33414ed2ceeca856f0faec7bec8b827dc3b671..6bea49982813e88767a79db86dc89becfb845ddd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,6 @@ Python 3 Conda: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - - export REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - 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: @@ -101,7 +100,6 @@ Python 3 Conda Apple: - export LANG=en_US.UTF-8 - export CONDA_ENVIRONMENT=.test-conda-env-py3-macos.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - - export REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - export CC=clang - set -o xtrace - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index eea9ddd7e59168d635c08f4a0f29ed04dc19ede5..cbf0efad3ebc7688138e04becf0fbccdc79b4277 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -19,4 +19,11 @@ dependencies: - clangdev - openmp - cython -# things not in here: loopy boxtree pymbolic meshmode sumpy + +- pip +- pip: + - git+https://gitlab.tiker.net/inducer/boxtree + - git+https://github.com/inducer/pymbolic + - git+https://github.com/inducer/loopy + - git+https://gitlab.tiker.net/inducer/sumpy + - git+https://github.com/inducer/meshmode diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt deleted file mode 100644 index fa6c042636713d94361fb116af2afb80e4d9097e..0000000000000000000000000000000000000000 --- a/.test-conda-env-py3-requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -git+https://gitlab.tiker.net/inducer/boxtree -git+https://github.com/inducer/pymbolic -git+https://github.com/inducer/loopy -git+https://gitlab.tiker.net/inducer/sumpy -git+https://github.com/inducer/meshmode diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 8023391b5f8598a9c94677f2d5dcefd0c6537f5d..19d8881cebc59f4405cf5960b0cb4bdb63edefc9 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -15,4 +15,11 @@ dependencies: - python-symengine=0.3.0 - pyfmmlib - cython -# things not in here: loopy boxtree pymbolic meshmode sumpy + +- pip +- pip: + - git+https://gitlab.tiker.net/inducer/boxtree + - git+https://github.com/inducer/pymbolic + - git+https://github.com/inducer/loopy + - git+https://gitlab.tiker.net/inducer/sumpy + - git+https://github.com/inducer/meshmode