update pkg versions

Author: MuellerSeb

_includes/footer.md

@@ -1,6 +1,6 @@
 
 
-Copyright 2019, Sebastian Müller, Lennart Schüler, Falk Heße
+Copyright 2019 - 2020, Sebastian Müller, Lennart Schüler, Falk Heße
 —
 [GeoStat-Framework]({{ site.source_link }})
 —

_posts/2019-01-01-gstools.md

@@ -14,7 +14,7 @@ icon: "/docs/source/pics/gs-head.png"
 <img src="/docs/source/pics/gs-3d.png" alt="Gau-Model" width="25%">
 </p>
 
-### GeoStatTools is a library providing geostatistical tools like random field generation, variogram estimation and **user-defined** covariance models.
+### GeoStatTools is a library providing geostatistical tools like kriging, random field generation, variogram estimation and **user-defined** covariance models.
 
 <p align="center">
 <table style="margin-left: auto; margin-right: auto; width: 90%;">
@@ -32,7 +32,7 @@ icon: "/docs/source/pics/gs-head.png"
     <p><strong>Documentation</strong></p>
   </td>
   <td style="text-align: left;">
-    <a href="https://geostat-framework.readthedocs.io/projects/gstools/en/latest/">
+    <a href="https://gstools.readthedocs.io">
     <p>ReadTheDocs</p>
     </a>
   </td>

_posts/2019-01-02-ogs5py.md

@@ -30,7 +30,7 @@ icon: "/docs/source/pics/ogs-head.png"
     <p><strong>Documentation</strong></p>
   </td>
   <td style="text-align: left;">
-    <a href="https://geostat-framework.readthedocs.io/projects/ogs5py/en/latest/">
+    <a href="https://ogs5py.readthedocs.io">
     <p>ReadTheDocs</p>
     </a>
   </td>

_posts/2019-01-03-welltestpy.md

@@ -30,7 +30,7 @@ icon: "/docs/source/pics/wtp-head.png"
     <p><strong>Documentation</strong></p>
   </td>
   <td style="text-align: left;">
-    <a href="https://geostat-framework.readthedocs.io/projects/welltestpy/en/latest/">
+    <a href="https://welltestpy.readthedocs.io">
     <p>ReadTheDocs</p>
     </a>
   </td>

_posts/2019-01-04-anaflow.md

@@ -30,7 +30,7 @@ icon: "/docs/source/pics/af-head.png"
     <p><strong>Documentation</strong></p>
   </td>
   <td style="text-align: left;">
-    <a href="https://geostat-framework.readthedocs.io/projects/anaflow/en/latest/">
+    <a href="https://anaflow.readthedocs.io">
     <p>ReadTheDocs</p>
     </a>
   </td>

_posts/2019-01-05-about.md

@@ -12,7 +12,7 @@ This Framework was created within the PhD project of [Sebastian Müller](https:/
 You can contact us via <info@geostat-framework.org>.
 
 <p align="center">
-<img src="/img/UFZ_LOGO.jpg" alt="UFZ" width="20%">
+<img src="/img/UFZ_LOGO.png" alt="UFZ" width="40%">
 <img src="/img/dbu.png" alt="DBU" width="20%">
 </p>
 

docs/source/conf.py

@@ -27,6 +27,8 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
+import datetime
+
 extensions = [
 ]
 
@@ -45,8 +47,9 @@
 master_doc = "contents"
 
 # General information about the project.
+curr_year = datetime.datetime.now().year
 project = "GeoStat Framework"
-copyright = u"2018, Sebastian Müller, Lennart Schüler"
+copyright = "2018 - {}, Sebastian Müller, Lennart Schüler".format(curr_year)
 author = u"Sebastian Müller, Lennart Schüler"
 
 # The version info for the project you're documenting, acts as replacement for
@@ -121,13 +124,16 @@
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = "GeoStatFrameworkdoc"
+# logos for the page
+html_logo = "pics/GeoStat-150.png"
+html_favicon = "pics/GeoStat.ico"
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, "geostattools", "GeoStatTools Documentation", [author], 1)
+    (master_doc, "geostat-framework", "GeoStat-Framework Documentation", [author], 1)
 ]
 
 suppress_warnings = [

docs/source/index.rst

@@ -1,12 +1,8 @@
-=================
-GeoStat Framework
-=================
-
 .. image:: pics/GeoStat.png
    :width: 250px
    :align: center
 
-The GeoStat Framework is a Python framework for geostatistical simulations.
+.. centered:: **Create your geo-statistical model with Python!**
 
 
 Included Packages
@@ -18,19 +14,58 @@ The following Python-Packages are part of the GeoStat Framework.
 GSTools
 -------
 
-GeoStatTools is a library providing geostatistical tools like
-random field generation, variogram estimation and covariance models.
+GeoStatTools is a library providing geostatistical tools like kriging,
+random field generation, variogram estimation, covariance models and much more.
 
 .. image:: pics/gstools.png
    :width: 150px
    :align: center
 
-:Source:
-    https://github.com/GeoStat-Framework/GSTools
-:Documentation:
-    https://geostat-framework.readthedocs.io/projects/gstools
-:Installation:
-    ``pip install gstools``
+.. list-table::
+   :widths: 33 67
+
+   * - **Version**
+     - .. image:: https://badge.fury.io/py/gstools.svg
+          :target: https://badge.fury.io/py/gstools
+       .. image:: https://img.shields.io/conda/vn/conda-forge/gstools.svg
+          :target: https://anaconda.org/conda-forge/gstools
+
+   * - **Installation**
+     - ``pip install gstools`` *or* ``conda install gstools``
+
+   * - **Source**
+     - https://github.com/GeoStat-Framework/GSTools
+
+   * - **Documentation**
+     - https://gstools.readthedocs.io
+
+
+PyKrige
+-------
+
+PyKrige provides 2D and 3D ordinary and universal kriging.
+
+.. image:: pics/PyKrige.png
+   :width: 150px
+   :align: center
+
+.. list-table::
+   :widths: 33 67
+
+   * - **Version**
+     - .. image:: https://badge.fury.io/py/PyKrige.svg
+          :target: https://badge.fury.io/py/PyKrige
+       .. image:: https://img.shields.io/conda/vn/conda-forge/pykrige.svg
+          :target: https://anaconda.org/conda-forge/pykrige
+
+   * - **Installation**
+     - ``pip install PyKrige`` *or* ``conda install pykrige``
+
+   * - **Source**
+     - https://github.com/GeoStat-Framework/PyKrige
+
+   * - **Documentation**
+     - https://pykrige.readthedocs.io
 
 
 ogs5py
@@ -42,12 +77,23 @@ ogs5py is a Python-API for the OpenGeoSys 5 scientific modeling package.
    :width: 150px
    :align: center
 
-:Source:
-    https://github.com/GeoStat-Framework/ogs5py
-:Documentation:
-    https://geostat-framework.readthedocs.io/projects/ogs5py
-:Installation:
-    ``pip install ogs5py``
+.. list-table::
+   :widths: 33 67
+
+   * - **Version**
+     - .. image:: https://badge.fury.io/py/ogs5py.svg
+          :target: https://badge.fury.io/py/ogs5py
+       .. image:: https://img.shields.io/conda/vn/conda-forge/ogs5py.svg
+          :target: https://anaconda.org/conda-forge/ogs5py
+
+   * - **Installation**
+     - ``pip install ogs5py`` *or* ``conda install ogs5py``
+
+   * - **Source**
+     - https://github.com/GeoStat-Framework/ogs5py
+
+   * - **Documentation**
+     - https://ogs5py.readthedocs.io
 
 
 WellTestPy
@@ -59,13 +105,22 @@ WellTestPy is a python-package for handling well based field campaigns.
    :width: 150px
    :align: center
 
-:Source:
-    https://github.com/GeoStat-Framework/welltestpy
-:Documentation:
-    https://geostat-framework.readthedocs.io/projects/welltestpy
-:Installation:
-    ``pip install welltestpy``
-    
+.. list-table::
+   :widths: 33 67
+
+   * - **Version**
+     - .. image:: https://badge.fury.io/py/welltestpy.svg
+          :target: https://badge.fury.io/py/welltestpy
+
+   * - **Installation**
+     - ``pip install welltestpy``
+
+   * - **Source**
+     - https://github.com/GeoStat-Framework/welltestpy
+
+   * - **Documentation**
+     - https://welltestpy.readthedocs.io
+
 
 AnaFlow
 -------
@@ -77,9 +132,44 @@ groundwater-flow-equation.
    :width: 150px
    :align: center
 
-:Source:
-    https://github.com/GeoStat-Framework/AnaFlow
-:Documentation:
-    https://geostat-framework.readthedocs.io/projects/anaflow
-:Installation:
-    ``pip install anaflow``
+.. list-table::
+   :widths: 33 67
+
+   * - **Version**
+     - .. image:: https://badge.fury.io/py/anaflow.svg
+          :target: https://badge.fury.io/py/anaflow
+
+   * - **Installation**
+     - ``pip install anaflow``
+
+   * - **Source**
+     - https://github.com/GeoStat-Framework/AnaFlow
+
+   * - **Documentation**
+     - https://anaflow.readthedocs.io
+
+
+pentapy
+-------
+
+pentapy is a toolbox to deal with pentadiagonal matrices in Python.
+
+.. image:: pics/pentapy.png
+   :width: 150px
+   :align: center
+
+.. list-table::
+   :widths: 33 67
+
+   * - **Version**
+     - .. image:: https://badge.fury.io/py/pentapy.svg
+          :target: https://badge.fury.io/py/pentapy
+
+   * - **Installation**
+     - ``pip install pentapy``
+
+   * - **Source**
+     - https://github.com/GeoStat-Framework/pentapy
+
+   * - **Documentation**
+     - https://pentapy.readthedocs.io