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

TRIQS · Mar 25, 2024 · 13dd62d · 13dd62d
2 parents d5db329 + 2ec749a
commit 13dd62d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,6 +112,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 b/Dockerfile
@@ -2,8 +2,7 @@
 FROM flatironinstitute/triqs:unstable-ubuntu-clang
 ARG APPNAME=triqs_dft_tools
 
-COPY requirements.txt /src/$APPNAME/requirements.txt
-RUN pip3 install -r /src/$APPNAME/requirements.txt
+RUN apt-get install -y meson ninja-build python3-setuptools
 
 COPY --chown=build . $SRC/$APPNAME
 WORKDIR $BUILD/$APPNAME

diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,11 @@ numpy
 scipy
 meson
 setuptools
-ninja
+ninja
+# For documentation builds we additionaly require
+#sphinx
+#numpydoc
+#nbsphinx
+#sphinx_rtd_theme
+#myst_parser
+#linkify-it-py