From 86c71fff0406587db74c4d53d976502f12741f32 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner <inform@tiker.net> Date: Tue, 28 Jul 2020 17:31:41 -0500 Subject: [PATCH] Move pyvisfile from CI config to requirements.txt --- .gitlab-ci.yml | 6 +++--- requirements.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b89185d7..3c9da790 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ Python 3 Nvidia K40: script: - export PY_EXE=python3 - export PYOPENCL_TEST=nvi:k40 - - export EXTRA_INSTALL="pybind11 cython numpy mako pyvisfile" + - export EXTRA_INSTALL="pybind11 cython numpy mako" # cython is here because pytential (for now, for TS) depends on it - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" @@ -20,7 +20,7 @@ Python 3 POCL: - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread # cython is here because pytential (for now, for TS) depends on it - - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py pyvisfile" + - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: @@ -38,7 +38,7 @@ Python 3 POCL: - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread # cython is here because pytential (for now, for TS) depends on it - - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py pyvisfile" + - export EXTRA_INSTALL="pybind11 cython numpy mako mpi4py" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: diff --git a/requirements.txt b/requirements.txt index 574e5094..939b0e4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,7 @@ numpy recursivenodes git+https://gitlab.tiker.net/inducer/pytools.git#egg=pytools git+https://gitlab.tiker.net/inducer/gmsh_interop.git#egg=gmsh_interop +git+https://gitlab.tiker.net/inducer/pyvisfile.git#egg=pyvisfile git+https://gitlab.tiker.net/inducer/modepy.git#egg=modepy git+https://gitlab.tiker.net/inducer/pyopencl.git#egg=pyopencl git+https://gitlab.tiker.net/inducer/islpy.git#egg=islpy -- GitLab