Merge branch 'master' into 'release'

prepare for v1.0.4

See merge request !21

ippisite/.flake8

 [flake8]
 max-line-length = 120
 ignore = W503
-exclude = */migrations/*.py, manage.py, docs/source/conf.py
+exclude = */migrations/*.py, manage.py, docs/source/conf.py, get-pip.py

ippisite/ippidb/templates/about-general.html

@@ -32,6 +32,11 @@
 	</div>
 </div>
 
+<h2 id="terms-privacy" class="mt-5 text-center">Features and Data Evolution</h2>
+<div class="row justify-content-center">
+	<img src="/static/images/Other/EvolutionPlan.png" style="height: 700px;">
+</div>
+
 <h2 id="terms-privacy" class="mt-5 text-center">Terms and Privacy</h2>
 
 <h5 class="row justify-content-center">What personal data is collected?</h5>

ippisite/requirements-dev-rachel.txt

+-r requirements-rachel.txt
+# linting and formatting
+flake8
+black
+flake8-black
+# documentation generation
+sphinx
+sphinx_rtd_theme
+# coverage
+coverage
+# tests
+requests-cache
+parameterized
+# dependencies to generate graph models using django-extensions
+#pygraphviz
+#pydot
+pyparsing
+pyyaml>=5.1
\ No newline at end of file

ippisite/requirements-rachel.txt

@@ -6,18 +6,24 @@ django-extensions
 django-formtools
 django-debug-toolbar
 django-allauth
+django-celery-results==1.2.1
 # import scripts
 pandas==1.0.5
+openpyxl
+xlwt
 # web services
 bioservices
 bioblend
 bs4
+chembl_webresource_client
 # libraries to compute PCA
 sklearn
 scipy
 matplotlib==2.2.3 #Matplotlib 3.0+ does not support Python 2.x, 3.0, 3.1, 3.2, 3.3, or 3.4.
+seaborn
 # postgres driver
 #psycopg2
+psycopg2-binary
 git+https://gitlab.pasteur.fr/hmenager/django-diu.git#egg=django_diu
 # openbabel is not installed from pip for now
 # openbabel