From 32e399a384ebf69e9b1d25a54dcf72da1d971475 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Tue, 16 Nov 2021 12:06:40 -0500 Subject: [PATCH 01/15] [cmake] Fix googletest master branch was renamed to main --- deps/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index d92ff08f..8281e7fb 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -61,7 +61,7 @@ endif() # -- GTest -- external_dependency(GTest GIT_REPO https://github.com/google/googletest - GIT_TAG master + GIT_TAG main BUILD_ALWAYS EXCLUDE_FROM_ALL ) From cdcb46dca9bc4e0867163b1ddc9530aa5fc8d1c1 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 18 Nov 2021 16:37:20 -0500 Subject: [PATCH 02/15] [cmake] No longer set CPLUS_INCLUDE_PATH and LIBRARY_PATH in triqsvars.sh, already done through cmake target --- share/app4triqsvars.sh.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/share/app4triqsvars.sh.in b/share/app4triqsvars.sh.in index 492a7a26..826f2704 100644 --- a/share/app4triqsvars.sh.in +++ b/share/app4triqsvars.sh.in @@ -2,9 +2,7 @@ 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 e58cd8c19d96025362018011418a01f1d324f4fb Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Tue, 14 Dec 2021 17:39:10 -0500 Subject: [PATCH 03/15] Bump clang version for github action build from 12 to 13 --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fcdfe1ef..4db3680e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: matrix: include: - {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10} - - {os: ubuntu-20.04, cc: clang-12, cxx: clang++-12} + - {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++} @@ -30,16 +30,16 @@ jobs: sudo apt-get install lsb-release wget software-properties-common && wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && sudo chmod +x /tmp/llvm.sh && sudo /tmp/llvm.sh 12 && sudo apt-get install - clang-12 + clang-13 g++-10 gfortran hdf5-tools libblas-dev libboost-dev - libclang-12-dev - libc++-12-dev - libc++abi-12-dev - libomp-12-dev + libclang-13-dev + libc++-13-dev + libc++abi-13-dev + libomp-13-dev libfftw3-dev libgfortran5 libgmp-dev @@ -49,7 +49,7 @@ jobs: openmpi-bin openmpi-common openmpi-doc - python3-clang-12 + python3-clang-13 python3-dev python3-mako python3-matplotlib From 67e07551f739255be1f268c7bf4afadbe4fbc0e9 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 20 Jan 2022 15:28:32 -0500 Subject: [PATCH 04/15] [ghactions] Fix: Run llvm install script for version 13 instead of 12 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4db3680e..ea3ff7ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: run: > sudo apt-get update && sudo apt-get install lsb-release wget software-properties-common && - wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && sudo chmod +x /tmp/llvm.sh && sudo /tmp/llvm.sh 12 && + wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && sudo chmod +x /tmp/llvm.sh && sudo /tmp/llvm.sh 13 && sudo apt-get install clang-13 g++-10 From 4b6cc21a2c773358c87ff94b3ebe677a501c86e4 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 20 Jan 2022 15:28:46 -0500 Subject: [PATCH 05/15] [cmake] Fix warning in FindSphinx.cmake --- share/cmake/Modules/FindSphinx.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/cmake/Modules/FindSphinx.cmake b/share/cmake/Modules/FindSphinx.cmake index b8cc28a8..6901b853 100644 --- a/share/cmake/Modules/FindSphinx.cmake +++ b/share/cmake/Modules/FindSphinx.cmake @@ -32,6 +32,6 @@ else() endif () include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SPHINX DEFAULT_MSG SPHINXBUILD_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx DEFAULT_MSG SPHINXBUILD_EXECUTABLE) mark_as_advanced( SPHINXBUILD_EXECUTABLE ) From 60b27ad3c9972b993a18aef8e47eb76888d2719d Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 20 Jan 2022 15:38:11 -0500 Subject: [PATCH 06/15] [jenkins] Build argument -DBuild_Deps=Always no longer needed, is now the default --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 015cd74b..5502cd9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,6 @@ RUN chown build . USER build ARG BUILD_ID ARG CMAKE_ARGS -RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} -DBuild_Deps=Always $CMAKE_ARGS && make -j4 || make -j1 VERBOSE=1 +RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} $CMAKE_ARGS && make -j4 || make -j1 VERBOSE=1 USER root RUN make install From 63d06e5444cdea46e06fba333486f15fd0e4bcac Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 20 Jan 2022 16:33:39 -0500 Subject: [PATCH 07/15] [ghactions] Switch from macos-11 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 From 6cae099a1b7bb0951009d5c1268d65d9c0cf03d9 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Mon, 24 Jan 2022 14:34:25 -0500 Subject: [PATCH 08/15] [ghactions] Switch back to macos-11 workers as macos-12 ones are not yet available --- .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 5da889c2..c53a9af0 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-12, cc: gcc-11, cxx: g++-11} - - {os: macos-12, cc: /usr/local/opt/llvm/bin/clang, cxx: /usr/local/opt/llvm/bin/clang++} + - {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++} runs-on: ${{ matrix.os }} From 3b1d926dae6b3fd3e7630a84dd2bb5bdeeb94c44 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Mon, 24 Jan 2022 14:55:00 -0500 Subject: [PATCH 09/15] [ghactions] Correction to build.yml for macos-11 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c53a9af0..ea3ff7ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: python3-nbsphinx - name: Install homebrew dependencies - if: matrix.os == 'macos-12' + if: matrix.os == 'macos-11' run: | brew install gcc@11 llvm boost fftw hdf5 open-mpi openblas pip3 install mako numpy scipy mpi4py From 157d5d254996ea4d65b1a9f962e84fd6c03023b4 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Mon, 7 Feb 2022 17:06:18 -0500 Subject: [PATCH 10/15] [doc] Update Changelog for 3.1.0 --- doc/ChangeLog.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index 165c897a..8d708da5 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -2,8 +2,20 @@ # Changelog -## Version 3.0.0 +## Version 3.1.0 +app4triqs version 3.1.0 is a compatibility +release for TRIQS version 3.1.0 that +* moves to cmake 3.12.4 and c++20 +* improves ghactions and jenkins configuration +* switches documentation to read-the-docs theme +* uses googletest main branch +* fixes several skeleton issues + +We thank all contributors: Alexander Hampel, Dylan Simon, Nils Wentzell + + +## Version 3.0.0 app4triqs version 3.0.0 is a compatibility release for TRIQS version 3.0.0 that From 4f183b9bb29c154acdda6fd6689974f0c27fab63 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 10 Feb 2022 15:34:45 -0500 Subject: [PATCH 11/15] Run port_to_triqs3 script --- c++/app4triqs/app4triqs.cpp | 2 +- c++/app4triqs/app4triqs.hpp | 1 + python/app4triqs/app4triqs_module_desc.py | 2 +- test/python/Basic.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/c++/app4triqs/app4triqs.cpp b/c++/app4triqs/app4triqs.cpp index 5d65b979..a16840c1 100644 --- a/c++/app4triqs/app4triqs.cpp +++ b/c++/app4triqs/app4triqs.cpp @@ -19,7 +19,7 @@ namespace app4triqs { void h5_write(h5::group grp, std::string subgroup_name, toto const &m) { grp = subgroup_name.empty() ? grp : grp.create_group(subgroup_name); h5_write(grp, "i", m.i); - h5_write_attribute(grp, "TRIQS_HDF5_data_scheme", toto::hdf5_format()); + h5_write_attribute(grp, "Format", toto::hdf5_format()); } void h5_read(h5::group grp, std::string subgroup_name, toto &m) { diff --git a/c++/app4triqs/app4triqs.hpp b/c++/app4triqs/app4triqs.hpp index e9764206..b92d513b 100644 --- a/c++/app4triqs/app4triqs.hpp +++ b/c++/app4triqs/app4triqs.hpp @@ -1,5 +1,6 @@ #pragma once #include +#include #include
namespace app4triqs { diff --git a/python/app4triqs/app4triqs_module_desc.py b/python/app4triqs/app4triqs_module_desc.py index eff521b9..161e72f7 100644 --- a/python/app4triqs/app4triqs_module_desc.py +++ b/python/app4triqs/app4triqs_module_desc.py @@ -1,5 +1,5 @@ # Generated automatically using the command : -# c++2py ../../c++/app4triqs/app4triqs.hpp -p --members_read_only -N app4triqs -a app4triqs -m app4triqs_module -o app4triqs_module --moduledoc="The app4triqs python module" -C pytriqs --cxxflags="-std=c++17" --target_file_only +# c++2py ../../c++/app4triqs/app4triqs.hpp -p --members_read_only -N app4triqs -a app4triqs -m app4triqs_module -o app4triqs_module --moduledoc="The app4triqs python module" -C triqs --cxxflags="-std=c++17" --target_file_only from cpp2py.wrap_generator import * # The module diff --git a/test/python/Basic.py b/test/python/Basic.py index 9ff46e2d..c0472fc5 100644 --- a/test/python/Basic.py +++ b/test/python/Basic.py @@ -3,7 +3,7 @@ import unittest from app4triqs import Toto, chain -from triqs.archive import * +from h5 import * from triqs.utility import mpi class test_toto(unittest.TestCase): From dcb545616226adb4d5ba376c98c38c37d7a8f1f4 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 16 Feb 2022 10:25:50 -0500 Subject: [PATCH 12/15] Update template for easybuild config file --- ...eb => TRIQS-app4triqs-3.1.0-foss-2021b.eb} | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) rename packaging/{TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb => TRIQS-app4triqs-3.1.0-foss-2021b.eb} (65%) diff --git a/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb b/packaging/TRIQS-app4triqs-3.1.0-foss-2021b.eb similarity index 65% rename from packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb rename to packaging/TRIQS-app4triqs-3.1.0-foss-2021b.eb index 42058438..21283b04 100644 --- a/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb +++ b/packaging/TRIQS-app4triqs-3.1.0-foss-2021b.eb @@ -1,22 +1,17 @@ easyblock = 'CMakeMake' name = 'TRIQS-app4triqs' -version = '3.0.0' -versionsuffix = '-Python-%(pyver)s' +version = '3.1.0' homepage = 'https://triqs.github.io/app4triqs/' description = """ - TRIQS (Toolbox for Research on Interacting Quantum Systems) is a - scientific project providing a set of C++ and Python libraries to - develop new tools for the study of interacting quantum systems. - PROVIDE HERE A DESCRIPTION OF YOUR APPLICATION """ docurls = ['https://triqs.github.io/app4triqs/%(version_major_minor)s.x/'] software_license = 'LicenseGPLv3' -toolchain = {'name': 'foss', 'version': '2019a'} +toolchain = {'name': 'foss', 'version': '2021b'} toolchainopts = {'pic': True, 'usempi': True} source_urls = ['https://github.com/TRIQS/app4triqs/releases/download/%(version)s/'] @@ -24,20 +19,20 @@ sources = ['app4triqs-%(version)s.tar.gz'] checksums = ['PUT HERE THE SHA256 OF THE RELEASE TARBALL'] dependencies = [ - ('Python', '3.7.2'), - ('SciPy-bundle', '2019.03'), - ('Boost', '1.70.0'), - ('Clang', '8.0.0'), - ('GMP', '6.1.2'), - ('HDF5', '1.10.5'), - ('Mako', '1.0.8'), - ('h5py', '2.9.0'), - ('TRIQS', '3.0.0', versionsuffix), - ('NFFT', '3.5.1') + ('Python', '3.9.6'), + ('SciPy-bundle', '2021.10'), + ('Boost', '1.77.0'), + ('Clang', '13.0.1'), + ('Clang-Python-bindings', '13.0.1'), + ('GMP', '6.2.1'), + ('HDF5', '1.10.7'), + ('Mako', '1.1.4'), + ('TRIQS', '3.1.0'), + ('NFFT', '3.5.2') ] builddependencies = [ - ('CMake', '3.13.3') + ('CMake', '3.22.1') ] separate_build_dir = True From d9c66bf77fcfec77871dad69c1a509ab9a1cb3a1 Mon Sep 17 00:00:00 2001 From: Alexander Hampel Date: Wed, 16 Feb 2022 09:16:49 -0500 Subject: [PATCH 13/15] enable autosummary in sphinx --- doc/CMakeLists.txt | 2 +- doc/_templates/autosummary_class_template.rst | 32 +++++++++ .../autosummary_module_template.rst | 68 +++++++++++++++++++ doc/conf.py.in | 7 ++ doc/documentation.rst | 11 ++- 5 files changed, 113 insertions(+), 7 deletions(-) create mode 100644 doc/_templates/autosummary_class_template.rst create mode 100644 doc/_templates/autosummary_module_template.rst diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 01d96c39..04d1ad06 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -56,7 +56,7 @@ endif() add_custom_target(${PROJECT_NAME}_docs_sphinx ALL) add_custom_command( TARGET ${PROJECT_NAME}_docs_sphinx - COMMAND PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SPHINXBUILD_EXECUTABLE} -c . -j8 -b html ${CMAKE_CURRENT_SOURCE_DIR} html + COMMAND PYTHONPATH=${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}:${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SPHINXBUILD_EXECUTABLE} -c . -b html ${CMAKE_CURRENT_SOURCE_DIR} html ) option(Sphinx_Only "When building the documentation, skip the Python Modules and the generation of C++ Api and example outputs" OFF) diff --git a/doc/_templates/autosummary_class_template.rst b/doc/_templates/autosummary_class_template.rst new file mode 100644 index 00000000..e74d21b5 --- /dev/null +++ b/doc/_templates/autosummary_class_template.rst @@ -0,0 +1,32 @@ +{{ fullname | escape | underline}} + +.. currentmodule:: {{ module }} + +.. autoclass:: {{ objname }} + :members: + :show-inheritance: + :inherited-members: + +{% block methods %} +.. automethod:: __init__ + +{% if methods %} +.. rubric:: {{ _('Methods') }} + +.. autosummary:: + {% for item in methods %} + ~{{ name }}.{{ item }} + {%- endfor %} +{% endif %} +{% endblock %} + +{% block attributes %} +{% if attributes %} +.. rubric:: {{ _('Attributes') }} + +.. autosummary:: + {% for item in attributes %} + ~{{ name }}.{{ item }} + {%- endfor %} +{% endif %} +{% endblock %} diff --git a/doc/_templates/autosummary_module_template.rst b/doc/_templates/autosummary_module_template.rst new file mode 100644 index 00000000..737206f8 --- /dev/null +++ b/doc/_templates/autosummary_module_template.rst @@ -0,0 +1,68 @@ +{{ fullname | escape | underline}} + +.. automodule:: {{ fullname }} + +{% block functions %} +{% if functions %} +.. rubric:: Functions + +.. autosummary:: + :toctree: + {% for item in functions %} + {{ item }} + {%- endfor %} +{% endif %} +{% endblock %} + +{% block attributes %} +{% if attributes %} +.. rubric:: Module Attributes + +.. autosummary:: + :toctree: + {% for item in attributes %} + {{ item }} + {%- endfor %} +{% endif %} +{% endblock %} + +{% block classes %} +{% if classes %} +.. rubric:: {{ _('Classes') }} + +.. autosummary:: + :toctree: + :template: autosummary_class_template.rst + {% for item in classes %} + {{ item }} + {%- endfor %} +{% endif %} +{% endblock %} + +{% block exceptions %} +{% if exceptions %} +.. rubric:: {{ _('Exceptions') }} + +.. autosummary:: + :toctree: + {% for item in exceptions %} + {{ item }} + {%- endfor %} +{% endif %} +{% endblock %} + +{% block modules %} +{% if modules %} +.. rubric:: Modules + +.. autosummary:: + :toctree: + :template: autosummary_module_template.rst + :recursive: + + {% for item in modules %} + {{ item }} + {%- endfor %} +{% endif %} +{% endblock %} + diff --git a/doc/conf.py.in b/doc/conf.py.in index 31e575f3..230762e6 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -6,6 +6,9 @@ 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'] + extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.intersphinx', @@ -39,6 +42,10 @@ pygments_style = 'sphinx' source_suffix = '.rst' +# Turn on sphinx.ext.autosummary +autosummary_generate = True +autosummary_imported_members=False + project = '@PROJECT_NAME@' version = '@PROJECT_VERSION@' diff --git a/doc/documentation.rst b/doc/documentation.rst index d68686ca..c82a0b5b 100644 --- a/doc/documentation.rst +++ b/doc/documentation.rst @@ -21,10 +21,9 @@ C++ reference manual Python reference manual ======================= -.. automodule:: app4triqs - :members: +.. autosummary:: + :toctree: _autosummary + :template: autosummary_module_template.rst + :recursive: -.. autoclass:: app4triqs.app4triqs_module.Toto - :members: - -.. autofunction:: app4triqs.app4triqs_module.chain + app4triqs_module From 8362b69e2892ce9cb1241abc20ecac0836819102 Mon Sep 17 00:00:00 2001 From: Alexander Hampel Date: Wed, 16 Feb 2022 14:49:35 -0500 Subject: [PATCH 14/15] properly load module and add toctree for class generation --- doc/CMakeLists.txt | 2 +- doc/_templates/autosummary_class_template.rst | 9 +++------ doc/conf.py.in | 2 +- doc/documentation.rst | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 04d1ad06..6578595a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -56,7 +56,7 @@ endif() add_custom_target(${PROJECT_NAME}_docs_sphinx ALL) add_custom_command( TARGET ${PROJECT_NAME}_docs_sphinx - COMMAND PYTHONPATH=${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}:${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SPHINXBUILD_EXECUTABLE} -c . -b html ${CMAKE_CURRENT_SOURCE_DIR} html + COMMAND PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SPHINXBUILD_EXECUTABLE} -j auto -c . -b html ${CMAKE_CURRENT_SOURCE_DIR} html ) option(Sphinx_Only "When building the documentation, skip the Python Modules and the generation of C++ Api and example outputs" OFF) diff --git a/doc/_templates/autosummary_class_template.rst b/doc/_templates/autosummary_class_template.rst index e74d21b5..49fc6786 100644 --- a/doc/_templates/autosummary_class_template.rst +++ b/doc/_templates/autosummary_class_template.rst @@ -1,19 +1,15 @@ -{{ fullname | escape | underline}} +{{ fullname | escape | underline }} .. currentmodule:: {{ module }} .. autoclass:: {{ objname }} - :members: - :show-inheritance: - :inherited-members: {% block methods %} -.. automethod:: __init__ - {% if methods %} .. rubric:: {{ _('Methods') }} .. autosummary:: + :toctree: {% for item in methods %} ~{{ name }}.{{ item }} {%- endfor %} @@ -25,6 +21,7 @@ .. rubric:: {{ _('Attributes') }} .. autosummary:: + :toctree: {% for item in attributes %} ~{{ name }}.{{ item }} {%- endfor %} diff --git a/doc/conf.py.in b/doc/conf.py.in index 230762e6..ff4697b1 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -73,7 +73,7 @@ html_theme_options = { # Toc options 'collapse_navigation': False, 'sticky_navigation': True, - 'navigation_depth': 4, + 'navigation_depth': 5, 'includehidden': True, 'titles_only': False } diff --git a/doc/documentation.rst b/doc/documentation.rst index c82a0b5b..277034fe 100644 --- a/doc/documentation.rst +++ b/doc/documentation.rst @@ -26,4 +26,4 @@ Python reference manual :template: autosummary_module_template.rst :recursive: - app4triqs_module + app4triqs From b74b87fc4be0915e54fbe141cc89a035d55c1c9c Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 24 Feb 2022 17:51:08 -0500 Subject: [PATCH 15/15] Bump version number in conda/meta.yaml --- packaging/conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/conda/meta.yaml b/packaging/conda/meta.yaml index 2fd369ef..e9d79fd1 100644 --- a/packaging/conda/meta.yaml +++ b/packaging/conda/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.0.0" %} +{% set version = "3.1.0" %} package: name: app4triqs