From 0dd11214191d31417b7555977837329f92e58bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 2 Oct 2018 13:31:00 -0400 Subject: [PATCH 1/4] Don't install all of jupyter in examples CI run May help with https://github.com/jupyter/jupyter_console/issues/158 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec2000c3d..29a4b657b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ Python 3.6 POCL Examples: script: - export PY_EXE=python3.6 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile ipython matplotlib jupyter nbconvert" + - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib nbconvert" - ". ./build-py-project-and-run-examples.sh" tags: - python3.6 -- GitLab From 97999153a0236ed2f7f2e510292bb063f1b67c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 2 Oct 2018 13:58:08 -0400 Subject: [PATCH 2/4] Localize dep on 'packaging' to CentOS package --- build-helpers/make-linux-build-docker-inner-part-2.sh | 4 ++++ requirements.txt | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-helpers/make-linux-build-docker-inner-part-2.sh b/build-helpers/make-linux-build-docker-inner-part-2.sh index 1e35a1e1b..035634b16 100755 --- a/build-helpers/make-linux-build-docker-inner-part-2.sh +++ b/build-helpers/make-linux-build-docker-inner-part-2.sh @@ -23,6 +23,10 @@ git clone --recursive git://github.com/inducer/loopy cd loopy grep -v pyopencl requirements.txt > myreq.txt + +# needed for pyinstaller package to be usable +echo packaging >> myreq.txt + pip install -r myreq.txt python setup.py install diff --git a/requirements.txt b/requirements.txt index a3e88cfea..97c202476 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,4 @@ git+https://github.com/inducer/codepy.git git+https://github.com/inducer/f2py # Optional, needed for using the C preprocessor on Fortran -ply>=3.6 - -# This is needed for the pyinstaller executable to be usable. -packaging +ply>=3.6 \ No newline at end of file -- GitLab From bc5d195d15ed019e9dc039b0ace8b744de083270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 2 Oct 2018 13:58:44 -0400 Subject: [PATCH 3/4] Add deps needed to keep nbconvert execute happy --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29a4b657b..913460d81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ Python 3.6 POCL Examples: script: - export PY_EXE=python3.6 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib nbconvert" + - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipython jupyter_client nbconvert" - ". ./build-py-project-and-run-examples.sh" tags: - python3.6 -- GitLab From da44bc51994bb7a21d595dd7859aa0c013ab545d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 2 Oct 2018 14:16:59 -0400 Subject: [PATCH 4/4] More futzing with examples CI package deps: Use ipykernel instead of ipython --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 913460d81..ea69114d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ Python 3.6 POCL Examples: script: - export PY_EXE=python3.6 - export PYOPENCL_TEST=portable - - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipython jupyter_client nbconvert" + - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipykernel nbconvert" - ". ./build-py-project-and-run-examples.sh" tags: - python3.6 -- GitLab