From 3c69da69cefb2a036984a570745d194f8dad25d6 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Thu, 25 Jun 2020 11:45:52 +0200 Subject: [PATCH 01/10] Update python version from 3.5 to 3.8 --- .travis.yml | 2 +- trigger_systemtests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e8f79f1b..f23a13c9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: true dist: trusty language: python python: - - "3.5" + - "3.8" services: - docker install: diff --git a/trigger_systemtests.py b/trigger_systemtests.py index 0572bd318..bf96bbe0c 100644 --- a/trigger_systemtests.py +++ b/trigger_systemtests.py @@ -153,7 +153,7 @@ def generate_travis_job(adapter, user, enable_output = False, trigger_failure = "dist": "trusty", "language": "python", "services": "docker", - "python": "3.5", + "python": "3.8", "install": "pip install Jinja2", "jobs": { "include":[ From 9843151bba88468ab988dc592dcaa1446d74fba5 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Thu, 25 Jun 2020 11:55:27 +0200 Subject: [PATCH 02/10] Use python version 3.7 --- .travis.yml | 2 +- trigger_systemtests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f23a13c9e..0199654e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: true dist: trusty language: python python: - - "3.8" + - "3.7" services: - docker install: diff --git a/trigger_systemtests.py b/trigger_systemtests.py index bf96bbe0c..d871b3c66 100644 --- a/trigger_systemtests.py +++ b/trigger_systemtests.py @@ -153,7 +153,7 @@ def generate_travis_job(adapter, user, enable_output = False, trigger_failure = "dist": "trusty", "language": "python", "services": "docker", - "python": "3.8", + "python": "3.7", "install": "pip install Jinja2", "jobs": { "include":[ From 28123eaa930b5f2b67f254f70d9b8d8d10fdc331 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Thu, 25 Jun 2020 11:58:36 +0200 Subject: [PATCH 03/10] Use python v3.6 --- .travis.yml | 2 +- trigger_systemtests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0199654e0..3d8227939 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: true dist: trusty language: python python: - - "3.7" + - "3.6" services: - docker install: diff --git a/trigger_systemtests.py b/trigger_systemtests.py index d871b3c66..f2b681288 100644 --- a/trigger_systemtests.py +++ b/trigger_systemtests.py @@ -153,7 +153,7 @@ def generate_travis_job(adapter, user, enable_output = False, trigger_failure = "dist": "trusty", "language": "python", "services": "docker", - "python": "3.7", + "python": "3.6", "install": "pip install Jinja2", "jobs": { "include":[ From eb768a868d801c415d6a93fcc15544fdd471054f Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Thu, 25 Jun 2020 13:30:05 +0200 Subject: [PATCH 04/10] Remove numpy install during precice build --- precice/Dockerfile.Ubuntu1804.home | 1 - 1 file changed, 1 deletion(-) diff --git a/precice/Dockerfile.Ubuntu1804.home b/precice/Dockerfile.Ubuntu1804.home index 4b754de13..ae1654e80 100644 --- a/precice/Dockerfile.Ubuntu1804.home +++ b/precice/Dockerfile.Ubuntu1804.home @@ -11,7 +11,6 @@ RUN apt-get -qq update && apt-get -qq install \ libxml2-dev \ petsc-dev \ git \ - python-numpy \ python-dev \ wget \ bzip2 \ From e502c0582a0149e8e7fe6febefc4f092c24bdf7b Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Thu, 25 Jun 2020 13:30:30 +0200 Subject: [PATCH 05/10] Update default precice base image --- adapters/Dockerfile.fenics-adapter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapters/Dockerfile.fenics-adapter b/adapters/Dockerfile.fenics-adapter index 4f2992ac0..3e96b1463 100644 --- a/adapters/Dockerfile.fenics-adapter +++ b/adapters/Dockerfile.fenics-adapter @@ -1,7 +1,7 @@ # System testing preCICE with fenics-adapter # Building on top of the latest preCICE-build -ARG from=precice/precice:latest +ARG from=precice/precice-ubuntu1804.home-develop FROM $from USER root From 0e39cd3280e52a451f661d9d0c7ccef663236b01 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Fri, 26 Jun 2020 00:42:06 +0200 Subject: [PATCH 06/10] Install numpy using pip3 --- adapters/Dockerfile.fenics-adapter | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adapters/Dockerfile.fenics-adapter b/adapters/Dockerfile.fenics-adapter index 3e96b1463..4fdca7207 100644 --- a/adapters/Dockerfile.fenics-adapter +++ b/adapters/Dockerfile.fenics-adapter @@ -26,7 +26,7 @@ RUN add-apt-repository -y ppa:fenics-packages/fenics && \ apt-get -qq install --no-install-recommends fenics && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install --user cython # TODO: can we put this dependency into requirements.txt of python? +RUN pip3 install --user cython numpy # TODO: can we put this dependency into requirements.txt of python? USER precice @@ -40,7 +40,7 @@ ARG adapter_branch=develop RUN pip3 install --user https://github.com/precice/python-bindings/archive/$bindings_branch.zip # Building fenics-adapter -RUN pip3 install --user https://github.com/precice/fenics-adapter/archive/$adapter_branch.zip +RUN pip3 install --user https://github.com/precice/fenics-adapter/archive/$adapter_branch .zip WORKDIR /home/precice RUN mkdir -p Logs Data/Input Data/Output Data/Exchange From c7b536b78279a0c80435e72f53fda4d4310ee52e Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Fri, 26 Jun 2020 00:47:39 +0200 Subject: [PATCH 07/10] Restore apt-get numpy install for base image --- precice/Dockerfile.Ubuntu1804.home | 1 + 1 file changed, 1 insertion(+) diff --git a/precice/Dockerfile.Ubuntu1804.home b/precice/Dockerfile.Ubuntu1804.home index ae1654e80..4b754de13 100644 --- a/precice/Dockerfile.Ubuntu1804.home +++ b/precice/Dockerfile.Ubuntu1804.home @@ -11,6 +11,7 @@ RUN apt-get -qq update && apt-get -qq install \ libxml2-dev \ petsc-dev \ git \ + python-numpy \ python-dev \ wget \ bzip2 \ From 3a289bf054b0e6a2ec03e135ec399754b6e90a98 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Fri, 26 Jun 2020 00:57:40 +0200 Subject: [PATCH 08/10] Fix link --- adapters/Dockerfile.fenics-adapter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapters/Dockerfile.fenics-adapter b/adapters/Dockerfile.fenics-adapter index 4fdca7207..628fb5e64 100644 --- a/adapters/Dockerfile.fenics-adapter +++ b/adapters/Dockerfile.fenics-adapter @@ -40,7 +40,7 @@ ARG adapter_branch=develop RUN pip3 install --user https://github.com/precice/python-bindings/archive/$bindings_branch.zip # Building fenics-adapter -RUN pip3 install --user https://github.com/precice/fenics-adapter/archive/$adapter_branch .zip +RUN pip3 install --user https://github.com/precice/fenics-adapter/archive/$adapter_branch.zip WORKDIR /home/precice RUN mkdir -p Logs Data/Input Data/Output Data/Exchange From 7c6cd124fecf0893282af80fb819dc73a758d9b7 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Fri, 26 Jun 2020 01:11:28 +0200 Subject: [PATCH 09/10] Specify numpy v1.14.5 --- adapters/Dockerfile.fenics-adapter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapters/Dockerfile.fenics-adapter b/adapters/Dockerfile.fenics-adapter index 628fb5e64..2ccb58bf6 100644 --- a/adapters/Dockerfile.fenics-adapter +++ b/adapters/Dockerfile.fenics-adapter @@ -26,7 +26,7 @@ RUN add-apt-repository -y ppa:fenics-packages/fenics && \ apt-get -qq install --no-install-recommends fenics && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install --user cython numpy # TODO: can we put this dependency into requirements.txt of python? +RUN pip3 install --user cython numpy==1.14.5 # TODO: can we put this dependency into requirements.txt of python? USER precice From 0827d1fe25991884e0e1e49fbaee92094914b958 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Sat, 27 Jun 2020 18:29:12 +0200 Subject: [PATCH 10/10] Move numpy install --- adapters/Dockerfile.fenics-adapter | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adapters/Dockerfile.fenics-adapter b/adapters/Dockerfile.fenics-adapter index 2ccb58bf6..28b7a9f9c 100644 --- a/adapters/Dockerfile.fenics-adapter +++ b/adapters/Dockerfile.fenics-adapter @@ -26,7 +26,7 @@ RUN add-apt-repository -y ppa:fenics-packages/fenics && \ apt-get -qq install --no-install-recommends fenics && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install --user cython numpy==1.14.5 # TODO: can we put this dependency into requirements.txt of python? +RUN pip3 install --user cython # TODO: can we put this dependency into requirements.txt of python? USER precice @@ -40,7 +40,7 @@ ARG adapter_branch=develop RUN pip3 install --user https://github.com/precice/python-bindings/archive/$bindings_branch.zip # Building fenics-adapter -RUN pip3 install --user https://github.com/precice/fenics-adapter/archive/$adapter_branch.zip +RUN pip3 install --user numpy==1.14.5 https://github.com/precice/fenics-adapter/archive/$adapter_branch.zip WORKDIR /home/precice RUN mkdir -p Logs Data/Input Data/Output Data/Exchange