Merge branch 'master' of https://github.com/virocon-organization/viro…

…concom

README.rst

@@ -8,16 +8,14 @@ ViroCon: viroconcom
 .. image:: https://coveralls.io/repos/github/virocon-organization/viroconcom/badge.svg?branch=master
     :target: https://coveralls.io/github/virocon-organization/viroconcom?branch=master
 
-ViroCon is a software to compute environmental contours.
+ViroCon is a software to compute environmental contours. `User Guide`_
 
 About
 -----
 
-viroconcom is a software package to compute environmental contours. It
-is written in Python 3.8 and belongs to the software ViroCon, which also
-offers a GUI for some functionality via the package viroconweb_.
+viroconcom is a Python software package to compute environmental contours. 
 
-ViroCon helps you to design marine structures, which need to withstand
+The software can support you to design marine structures, which need to withstand
 load combinations based on wave, wind and current. It lets you define
 extreme environmental conditions with a given return period using the
 environmental contour method.
@@ -89,6 +87,7 @@ Our documentation contains a user guide, with  examples how to
 
 Documentation
 -------------
+**Learn.** Our `User Guide`_ covers installation, requirementss and overall work flow.
 
 **Code.** The code’s documentation can be found `here`_.
 
@@ -129,6 +128,7 @@ License
 This software is licensed under the MIT license. For more information,
 read the file `LICENSE`_.
 
+.. _User Guide: https://virocon-organization.github.io/viroconcom/user_guide.html
 .. _viroconweb: https://github.com/virocon-organization/viroconweb
 .. _shell: https://en.wikipedia.org/wiki/Command-line_interface#Modern_usage_as_an_operating_system_shell
 .. _pyenv: https://github.com/pyenv/pyenv

requirements.txt

@@ -14,7 +14,7 @@ docutils==0.16
 idna==2.10
 imagesize==1.2.0
 iniconfig==1.0.1
-Jinja2==2.11.2
+Jinja2==2.11.3
 joblib==0.16.0
 kiwisolver==1.2.0
 MarkupSafe==1.1.1
@@ -25,10 +25,10 @@ numpy==1.19.1
 packaging==20.4
 pandas==1.1.1
 patsy==0.5.1
-Pillow==7.2.0
+Pillow==8.1.1
 pluggy==0.13.1
-py==1.9.0
-Pygments==2.6.1
+py==1.10.0
+Pygments==2.7.4
 pyparsing==2.4.7
 pytest==6.0.1
 pytest-cov==2.10.1