From 2d7a5748d8a5e822e89366ca934d7ae15b455ecf Mon Sep 17 00:00:00 2001 From: Alexander Hampel Date: Thu, 10 Mar 2022 13:35:14 -0500 Subject: [PATCH 1/4] automatically use version number set by cmake in doc --- doc/conf.py.in | 7 +++++++ doc/index.rst | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/conf.py.in b/doc/conf.py.in index ff4697b1..182c670f 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -49,6 +49,13 @@ autosummary_imported_members=False project = '@PROJECT_NAME@' version = '@PROJECT_VERSION@' +# this makes the current project version available as var in every rst file +rst_epilog = """ +.. |PROJECT_VERSION| replace:: {version} +""".format( +version = version, +) + copyright = '2017-2018 N. Wentzell, O. Parcollet 2018-2021 The Simons Foundation, authors: N. Wentzell, D. Simons, H. Strand, O. Parcollet' mathjax_path = "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=default" diff --git a/doc/index.rst b/doc/index.rst index 8d52d689..94054b86 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -3,9 +3,9 @@ app4triqs ********* -.. sidebar:: app4triqs 3.0.0 +.. sidebar:: app4triqs |PROJECT_VERSION| - This is the homepage of app4triqs v3.0.0. + This is the homepage of app4triqs |PROJECT_VERSION|. For changes see the :ref:`changelog page `. .. image:: _static/logo_github.png From f66445cf537c5babbc2157164ca4d004d92610aa Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Tue, 24 May 2022 16:12:04 -0400 Subject: [PATCH 2/4] Set CPLUS_INCLUDE_PATH and LIBRARY_PATH in app4triqsvars.sh --- share/app4triqsvars.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/app4triqsvars.sh.in b/share/app4triqsvars.sh.in index 826f2704..87618a18 100644 --- a/share/app4triqsvars.sh.in +++ b/share/app4triqsvars.sh.in @@ -2,7 +2,9 @@ export @PROJECT_NAME@_ROOT=@CMAKE_INSTALL_PREFIX@ +export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH +export LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LIBRARY_PATH export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@:$CMAKE_PREFIX_PATH @EXPORT_PYTHON_PATH@ From 82b7dfee15ff3655c942f8909e2bdc2082f0ee83 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Wed, 6 Jul 2022 15:26:06 -0400 Subject: [PATCH 3/4] [jenkins] remove my email --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6aa82bd8..771418cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -175,7 +175,7 @@ Changes: End of build log: \${BUILD_LOG,maxLines=60} """, - to: 'nwentzell@flatironinstitute.org, dsimon@flatironinstitute.org', + to: 'nwentzell@flatironinstitute.org', recipientProviders: [ [$class: 'DevelopersRecipientProvider'], ], From 64ad0ad9046e90bbfe74cdb095a479ef86f1b44c Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 7 Jul 2022 16:46:17 -0400 Subject: [PATCH 4/4] [ghactions] Switch osx build to macos-12 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea3ff7ef..5da889c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,8 +15,8 @@ jobs: include: - {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10} - {os: ubuntu-20.04, cc: clang-13, cxx: clang++-13} - - {os: macos-11, cc: gcc-11, cxx: g++-11} - - {os: macos-11, cc: /usr/local/opt/llvm/bin/clang, cxx: /usr/local/opt/llvm/bin/clang++} + - {os: macos-12, cc: gcc-11, cxx: g++-11} + - {os: macos-12, cc: /usr/local/opt/llvm/bin/clang, cxx: /usr/local/opt/llvm/bin/clang++} runs-on: ${{ matrix.os }} @@ -61,7 +61,7 @@ jobs: python3-nbsphinx - name: Install homebrew dependencies - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | brew install gcc@11 llvm boost fftw hdf5 open-mpi openblas pip3 install mako numpy scipy mpi4py