From ae4b92803ad093188f872d9d1662de1134bf5892 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 19 Apr 2024 11:23:50 -0400 Subject: [PATCH 1/4] [cmake] Remove C as a project language --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ab66c79..0e5dadf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ endif() # ############ # Define Project -project(app4triqs VERSION 3.2.0 LANGUAGES C CXX) +project(app4triqs VERSION 3.2.0 LANGUAGES CXX) get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY) # ############ From 1ade83c9eeaa7a4a18495bdb1343fbce8ba1357f Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Tue, 23 Apr 2024 14:27:42 -0400 Subject: [PATCH 2/4] [actions] Bump actions/cache restore/save to version 4 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15f352c3..55cbc541 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 with: path: ${{ env.CCACHE_DIR }} key: ccache-${{ matrix.os }}-${{ matrix.cc }}-${{ github.run_id }} @@ -133,7 +133,7 @@ jobs: if: always() run: ccache -sv - - uses: actions/cache/save@v3 + - uses: actions/cache/save@v4 if: always() with: path: ${{ env.CCACHE_DIR }} From 81113522b22f6b99d5d4f4db8d97a95d55600087 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Tue, 14 May 2024 15:07:21 -0400 Subject: [PATCH 3/4] [cmake] Bump Version number to 3.3 --- CMakeLists.txt | 6 +++--- packaging/TRIQS-app4triqs-foss-2021b.eb.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e5dadf0..dca0f459 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,12 +27,12 @@ endif() # ############ # Define Project -project(app4triqs VERSION 3.2.0 LANGUAGES CXX) +project(app4triqs VERSION 3.3.0 LANGUAGES CXX) get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY) # ############ # Load TRIQS and CPP2PY -find_package(TRIQS 3.2 REQUIRED) +find_package(TRIQS 3.3 REQUIRED) # Get the git hash & print status triqs_get_git_hash_of_source_dir(PROJECT_GIT_HASH) @@ -171,7 +171,7 @@ if(BUILD_DEBIAN_PACKAGE AND NOT IS_SUBPROJECT) set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/${PROJECT_NAME}") execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.2)") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.3)") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) include(CPack) diff --git a/packaging/TRIQS-app4triqs-foss-2021b.eb.in b/packaging/TRIQS-app4triqs-foss-2021b.eb.in index c5c96f2a..384c7818 100644 --- a/packaging/TRIQS-app4triqs-foss-2021b.eb.in +++ b/packaging/TRIQS-app4triqs-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') ] From f0f0789b45074ba4ead554af613e04ff811fc885 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Tue, 14 May 2024 15:07:39 -0400 Subject: [PATCH 4/4] Remove redundant sys.path insertion in conf.py.in --- doc/conf.py.in | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/conf.py.in b/doc/conf.py.in index aadfeac8..3eb0de9d 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -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']