From bbfe5a0e610b5eb27a4d91e8d870b2fc0c20e5bb Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 30 Aug 2019 20:58:57 -0500 Subject: [PATCH 1/2] Eliminate separate conda requirements files --- .test-conda-env-py3-requirements.txt | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .test-conda-env-py3-requirements.txt diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt deleted file mode 100644 index fa6c0426..00000000 --- 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 -- GitLab From ca5da6d41383304c287c0e304810a1f6a48d6c02 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 30 Aug 2019 20:59:40 -0500 Subject: [PATCH 2/2] Fix: Actually eliminate separate conda requirements files --- .gitlab-ci.yml | 2 -- .test-conda-env-py3-macos.yml | 9 ++++++++- .test-conda-env-py3.yml | 9 ++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f33414e..6bea4998 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 eea9ddd7..cbf0efad 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.yml b/.test-conda-env-py3.yml index 8023391b..19d8881c 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 -- GitLab