Merge branch 'unstable' of github:TRIQS/app4triqs into unstable

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}")
@@ -71,7 +71,7 @@ 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 "python, python-numpy, python-h5py, python-jinja2, python-mako, python-mpi4py, python-matplotlib, python-scipy, cpp2py (>= 1.5), triqs (>= 2.0)")
+  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)

ChangeLog.md

@@ -0,0 +1 @@
+doc/ChangeLog.md

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})
 
 # ---------------------------------

doc/ChangeLog.md

@@ -0,0 +1,7 @@
+Version 0.1
+-----------
+
+Some Changes 
+~~~~~~~~~~~~
+
+* ...

doc/changelog.rst

@@ -0,0 +1,8 @@
+.. _changelog:
+
+Changelog
+=========
+
+This document describes the main changes in APP4TRIQS.
+
+.. include:: ChangeLog.md

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'
 
@@ -39,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)}

doc/contents.rst

@@ -12,6 +12,7 @@ Contents
    index
    install
    issues
+   changelog
    about
 
 Reference manual

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 <changelog>`
+
 An example application using cpp2py and triqs.
 
 This documentation is generated based on `rst <https://de.wikipedia.org/wiki/ReStructuredText>`_ files