Merge remote-tracking branch 'app4triqs/unstable' into unstable

TRIQS · Mar 22, 2024 · 43786d7 · 43786d7
2 parents a780135 + 2ec749a
commit 43786d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -106,6 +106,7 @@ target_compile_options(${PROJECT_NAME}_warnings
     -Wpedantic
     -Wno-sign-compare
     $<$<CXX_COMPILER_ID:GNU>:-Wno-comma-subscript>
+    $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi> # Disable notes about ABI changes
     $<$<CXX_COMPILER_ID:GNU>:-Wshadow=local>
     $<$<CXX_COMPILER_ID:GNU>:-Wno-attributes>
     $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>

diff --git a/Dockerfile.build b/Dockerfile.build
@@ -2,9 +2,6 @@
 FROM flatironinstitute/triqs:base
 ARG APPNAME=nda
 
-COPY requirements.txt /src/$APPNAME/requirements.txt
-RUN pip3 install -r /src/$APPNAME/requirements.txt
-
 ARG BUILDUID=983
 RUN useradd -u $BUILDUID -m build