From 2b412dcdf2f365052e12d311e0ebb94dbef1c094 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 18:06:34 -0500 Subject: [PATCH 1/5] Add #egg= markers to requirements.txt --- requirements.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 101166fb..cf903183 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ numpy -git+https://github.com/inducer/pytools.git -git+https://github.com/inducer/pymbolic.git -git+https://github.com/inducer/islpy.git -git+https://github.com/inducer/pyopencl.git -git+https://github.com/inducer/loopy.git -git+https://gitlab.tiker.net/inducer/dagrt.git -git+https://gitlab.tiker.net/inducer/leap.git -git+https://github.com/inducer/meshpy.git -git+https://github.com/inducer/modepy.git -git+https://github.com/inducer/meshmode.git +git+https://github.com/inducer/pytools.git#egg=pytools +git+https://github.com/inducer/pymbolic.git#egg=pymbolic +git+https://github.com/inducer/islpy.git#egg=islpy +git+https://github.com/inducer/pyopencl.git#egg=pyopencl +git+https://github.com/inducer/loopy.git#egg=loo.py +git+https://gitlab.tiker.net/inducer/dagrt.git#egg=dagrt +git+https://gitlab.tiker.net/inducer/leap.git#egg=leap +git+https://github.com/inducer/meshpy.git#egg=meshpy +git+https://github.com/inducer/modepy.git#egg=modepy +git+https://github.com/inducer/meshmode.git#egg=meshmode -- GitLab From 3918263e7d751b5af2a0b0d46ec1ca7fc0cbc119 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 18:09:31 -0500 Subject: [PATCH 2/5] Delete pip packages from conda env --- .test-conda-env-py3.yml | 12 ------------ requirements.txt | 7 +++++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index c95608f4..31c74378 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -14,15 +14,3 @@ dependencies: - pyopencl - python=3 - gmsh - -- pip -- pip: - - git+https://github.com/inducer/pytools - - git+https://github.com/inducer/pymbolic - - git+https://github.com/inducer/loopy - - git+https://github.com/inducer/meshmode - - git+https://github.com/inducer/dagrt - - git+https://github.com/inducer/leap - - git+https://github.com/inducer/pyvisfile - - mpi4py - - pymetis diff --git a/requirements.txt b/requirements.txt index cf903183..650f0b79 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,14 @@ numpy +mpi4py git+https://github.com/inducer/pytools.git#egg=pytools git+https://github.com/inducer/pymbolic.git#egg=pymbolic git+https://github.com/inducer/islpy.git#egg=islpy git+https://github.com/inducer/pyopencl.git#egg=pyopencl git+https://github.com/inducer/loopy.git#egg=loo.py -git+https://gitlab.tiker.net/inducer/dagrt.git#egg=dagrt -git+https://gitlab.tiker.net/inducer/leap.git#egg=leap +git+https://github.com/inducer/dagrt.git#egg=dagrt +git+https://github.com/inducer/leap.git#egg=leap git+https://github.com/inducer/meshpy.git#egg=meshpy git+https://github.com/inducer/modepy.git#egg=modepy git+https://github.com/inducer/meshmode.git#egg=meshmode +git+https://github.com/inducer/pyvisfile.git#egg=pyvisfile +git+https://github.com/inducer/pymetis.git#egg=pymetis -- GitLab From 29134bc4daf7f0d0ddb8bf4b1a35993541cd4da9 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 18:19:51 -0500 Subject: [PATCH 3/5] Refactor Github test scripts (not just) for MPI dependency --- .github/workflows/ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3cb8006..d1506751 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,9 @@ jobs: - uses: actions/checkout@v2 - name: "Main Script" run: | - grep -v mpi4py .test-conda-env-py3.yml > .test-conda-env.yml - CONDA_ENVIRONMENT=.test-conda-env.yml + sudo apt-get update + sudo apt-get install openmpi-bin libopenmpi-dev + CONDA_ENVIRONMENT=.test-conda-env-py3.yml 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 @@ -45,12 +46,10 @@ jobs: run: | sudo apt-get update sudo apt-get install openmpi-bin libopenmpi-dev - grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-within-miniconda.sh - . ./build-py-project-within-miniconda.sh - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/run-examples.sh - . ./run-examples.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + build_py_project_in_conda_env + run_examples # vim: sw=4 -- GitLab From 347896f213111d78c147fc5468d2b40257d82026 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 18:29:33 -0500 Subject: [PATCH 4/5] Github CI: Actually source ci-support --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1506751..7e745cc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: sudo apt-get install openmpi-bin libopenmpi-dev CONDA_ENVIRONMENT=.test-conda-env.yml curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ci-support.sh build_py_project_in_conda_env run_examples -- GitLab From bba6451767e1090e635f1826097051181f6fd8ab Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 23:54:56 -0500 Subject: [PATCH 5/5] Github CI examples run: fix conda env name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e745cc1..0f0f630b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: run: | sudo apt-get update sudo apt-get install openmpi-bin libopenmpi-dev - CONDA_ENVIRONMENT=.test-conda-env.yml + CONDA_ENVIRONMENT=.test-conda-env-py3.yml curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ci-support.sh build_py_project_in_conda_env -- GitLab