Commit e96f5aed authored by Ossi Laine's avatar Ossi Laine
Browse files

Merge branch 'master' into 'dev'

# Conflicts:
#   requirements.txt
parents a1ee7143 dcfe881e
alembic==0.9.9
autopep8==1.4.4
Babel==2.6.0
click==6.7
cycler==0.10.0
decorator==4.4.0
dnspython==1.16.0
dominate==2.3.1
Flask==1.0.2
Flask-Babel==0.12.2
Flask-Bootstrap==3.3.7.1
......@@ -21,22 +13,10 @@ Flask-WTF==0.14.2
gevent==1.4.0
greenlet==0.4.15
gunicorn==19.9.0
itsdangerous==0.24
Jinja2==2.10
kiwisolver==1.0.1
lml==0.0.4
Mako==1.0.7
MarkupSafe==1.0
matplotlib==3.0.3
monotonic==1.5
mysql-connector==2.2.9
networkx==2.2
numpy==1.16.2
Pillow==6.0.0
ply==3.11
pycodestyle==2.5.0
pyexcel==0.5.9.1
pyexcel-io==0.5.9.1
PyMySQL==0.9.3
pyparsing==2.3.1
python-dateutil==2.7.3
......@@ -48,12 +28,8 @@ python-socketio==4.6.0
pytz==2018.7
rope==0.12.0
scipy==1.2.1
six==1.11.0
smop==0.41
SQLAlchemy==1.2.8
texttable==1.5.0
uuid==1.30
visitor==0.1.3
Werkzeug==0.14.1
WTForms==2.2.1
WTForms-SQLAlchemy==0.1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment