Merge remote-tracking branch 'app4triqs-remote/3.3.x' into unstable

TRIQS · Aug 13, 2024 · c55489e · c55489e
2 parents 2b25097 + 96110d2
commit c55489e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ unstable ]
+    branches: [ unstable, '[0-9]+.[0-9]+.x' ]
   pull_request:
-    branches: [ unstable ]
+    branches: [ unstable, '[0-9]+.[0-9]+.x' ]
   workflow_call:
   workflow_dispatch:
 
@@ -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 }}
@@ -135,7 +135,7 @@ jobs:
       if: always()
       run: ccache -sv
 
-    - uses: actions/cache/save@v3
+    - uses: actions/cache/save@v4
       if: always()
       with:
         path: ${{ env.CCACHE_DIR }}

diff --git 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']

diff --git a/packaging/TRIQS-cthyb-foss-2021b.eb.in b/packaging/TRIQS-cthyb-foss-2021b.eb.in
@@ -36,7 +36,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')
 ]