From 35a48aad807832798e1fe5235a29d5a2fd8a04f3 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 1 Jun 2018 16:51:49 +0200 Subject: [PATCH 1/4] [cmake] Adjust fallback version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2347786f..4652a148 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ execute_process(COMMAND bash "-c" "${TRIQS_GIT_EXECUTABLE} describe | sed \"s/-\ OUTPUT_STRIP_TRAILING_WHITESPACE ) if(NOT APP4TRIQS_VERSION) - set(APP4TRIQS_VERSION 1.5) + set(APP4TRIQS_VERSION 0.1) endif() triqs_get_git_hash_of_source_dir(APP4TRIQS_GIT_HASH) MESSAGE(STATUS "app4triqs version : ${APP4TRIQS_VERSION}") From 04d7aef339c2501fbbfe6aa70bda65ec10af58ec Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Sun, 3 Jun 2018 13:45:57 -0400 Subject: [PATCH 2/4] [deb] Adjust dependency generation --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4652a148..e4a2b692 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,6 +71,8 @@ if(BUILD_DEBIAN_PACKAGE) SET(CPACK_PACKAGE_VERSION ${APP4TRIQS_VERSION}) SET(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/app4triqs") EXECUTE_PROCESS(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) - SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.23), libgcc1 (>= 1:6), libstdc++6, python, libpython2.7, libopenmpi1.10, libhdf5-10, libgmp10, libfftw3-double3, libibverbs1, libgfortran3, zlib1g, libsz2, libhwloc5, libquadmath0, libaec0, libnuma1, libltdl7, libblas3, liblapack3, python-numpy, python-h5py, python-jinja2, python-mako, python-mpi4py, python-matplotlib, python-scipy, cpp2py (>= 1.5), triqs (>= 1.5)") + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 1.5), cpp2py (>= 1.5)") + SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) + SET(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) INCLUDE(CPack) endif() From 4a7ffbdf92e30678a4a2bece0bc1ea7dd958937b Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Sun, 3 Jun 2018 22:28:24 -0400 Subject: [PATCH 3/4] [doc] Fix few doc problems, add changelog --- ChangeLog.md | 1 + doc/CMakeLists.txt | 2 +- doc/ChangeLog.md | 7 +++++++ doc/changelog.rst | 8 ++++++++ doc/conf.py.in | 3 +-- doc/index.rst | 5 +++++ 6 files changed, 23 insertions(+), 3 deletions(-) create mode 120000 ChangeLog.md create mode 100644 doc/ChangeLog.md create mode 100644 doc/changelog.rst diff --git a/ChangeLog.md b/ChangeLog.md new file mode 120000 index 00000000..9e080e26 --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1 @@ +doc/ChangeLog.md \ No newline at end of file diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 24fccf0e..40bbedc8 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -19,7 +19,7 @@ add_dependencies(docs_sphinx app4triqs_c) # cp_rs is a script in cpp2py/bin, it mimics cp -rs on Linux # and filters the relevant extension # ------------------------------------------------------------------------------------------------ -set(EXT_FOR_DOC "rst png txt css_t conf css js gif jpg py html bib") +set(EXT_FOR_DOC "rst png txt css_t conf css js gif jpg py html bib md") execute_process(COMMAND cp_rs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${EXT_FOR_DOC}) # --------------------------------- diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md new file mode 100644 index 00000000..0806d26b --- /dev/null +++ b/doc/ChangeLog.md @@ -0,0 +1,7 @@ +Version 0.1 +----------- + +Some Changes +~~~~~~~~~~~~ + +* ... diff --git a/doc/changelog.rst b/doc/changelog.rst new file mode 100644 index 00000000..7c169e86 --- /dev/null +++ b/doc/changelog.rst @@ -0,0 +1,8 @@ +.. _changelog: + +Changelog +========= + +This document describes the main changes in APP4TRIQS. + +.. include:: ChangeLog.md diff --git a/doc/conf.py.in b/doc/conf.py.in index 195e871d..d93c0c0b 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -13,8 +13,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinx.ext.autosummary', 'plot_directive', - 'numpydoc', - 'matplotlib.sphinxext.plot_directive'] + 'numpydoc'] source_suffix = '.rst' diff --git a/doc/index.rst b/doc/index.rst index d342e1ad..b4cd7805 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -3,6 +3,11 @@ app4triqs ========= +.. sidebar:: app4triqs 0.1 + + This is the homepage app4triqs Version 0.1 + For the changes in 0.1, Cf :ref:`changelog page ` + An example application using cpp2py and triqs. This documentation is generated based on `rst `_ files From 81ed3a96963436ed57cfb7fd4a4f7f5ce8102f7f Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Sun, 3 Jun 2018 22:32:24 -0400 Subject: [PATCH 4/4] [doc] Fix a few doc warnings --- doc/conf.py.in | 2 +- doc/contents.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/conf.py.in b/doc/conf.py.in index d93c0c0b..26f1cfe3 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -38,4 +38,4 @@ html_sidebars = {'index': ['sideb.html', 'searchbox.html']} htmlhelp_basename = 'APP4TRIQSdoc' -intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None), 'triqslibs': ('https://triqs.github.io/triqs', None)} +intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None), 'triqslibs': ('https://triqs.github.io/triqs/master', None)} diff --git a/doc/contents.rst b/doc/contents.rst index 16954194..217ae295 100644 --- a/doc/contents.rst +++ b/doc/contents.rst @@ -12,6 +12,7 @@ Contents index install issues + changelog about Reference manual