Merge remote-tracking branch 'origin/unstable' into dev_gw_embedding

TRIQS · May 20, 2024 · 8af80d1 · 8af80d1
2 parents e8c5f7a + e3866eb
commit 8af80d1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 
 # ############
 # Define Project
-project(solid_dmft VERSION 3.3.0 LANGUAGES C CXX)
+project(solid_dmft VERSION 3.3.0 LANGUAGES CXX)
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
 # ############

diff --git a/Docker/jenkins_ci_dockerfile b/Docker/jenkins_ci_dockerfile
@@ -2,6 +2,8 @@
 FROM flatironinstitute/cthyb:master-ubuntu-clang
 ARG APPNAME=solid_dmft
 
+RUN apt-get install -y meson ninja-build python3-setuptools python3-skimage python3-tomli
+
 ENV OMP_NUM_THREADS=1
 
 # install dfttools maxent hubbardI and HartreeFock
@@ -29,9 +31,6 @@ RUN cd / && git clone -b unstable --depth 1 https://github.com/TRIQS/maxent.git
     && cmake ../maxent.src \
     && make install
 
-COPY requirements.txt /src/$APPNAME/requirements.txt
-RUN pip3 install -r /src/$APPNAME/requirements.txt
-
 COPY --chown=build . $SRC/$APPNAME
 WORKDIR $BUILD/$APPNAME
 RUN chown build .

diff --git a/doc/conf.py b/doc/conf.py
@@ -4,7 +4,6 @@
 
 import sys
 sys.path.insert(0, "@CMAKE_CURRENT_SOURCE_DIR@/sphinxext")
-sys.path.insert(0, "@CMAKE_CURRENT_SOURCE_DIR@/sphinxext/numpydoc")
 
 # exclude these folders from scanning by sphinx
 exclude_patterns = ['_templates', 'debugging_examples']

diff --git a/packaging/solid_dmft-foss-2021b.eb.in b/packaging/solid_dmft-foss-2021b.eb.in
@@ -27,7 +27,7 @@ dependencies = [
     ('GMP', '6.2.1'),
     ('HDF5', '1.10.7'),
     ('Mako', '1.1.4'),
-    ('TRIQS', '3.2.0'),
+    ('TRIQS', '3.3.0'),
     ('NFFT', '3.5.2')
 ]