3
0
mirror of https://github.com/triqs/dft_tools synced 2024-12-22 20:34:38 +01:00

Merge branch 'py3' into unstable

This commit is contained in:
Dylan Simon 2020-05-19 14:39:54 -04:00
commit ab12e2f966
2 changed files with 2 additions and 2 deletions

View File

@ -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

2
Jenkinsfile vendored
View File

@ -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 {