From 116df6ef67f4036367050d18212adfa8b9b7bf19 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Sat, 16 May 2020 13:04:43 -0400 Subject: [PATCH] [jenkins] initial py3 changes --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47a32495..483d7f1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM flatironinstitute/triqs:unstable-ubuntu-clang ARG APPNAME=app4triqs COPY requirements.txt /src/$APPNAME/requirements.txt -RUN pip install -r /src/$APPNAME/requirements.txt +RUN pip3 install -r /src/$APPNAME/requirements.txt COPY --chown=build . $SRC/$APPNAME WORKDIR $BUILD/$APPNAME diff --git a/Jenkinsfile b/Jenkinsfile index d52b1ce4..0c37d45e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) { "CMAKE_PREFIX_PATH=$triqsDir/lib/cmake/triqs"]) { deleteDir() /* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */ - sh "pip install -r $srcDir/requirements.txt" + sh "pip3 install -r $srcDir/requirements.txt" sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir" sh "make -j2" try {