From 58082763efb1f0f1572570da112474ff262659e8 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Fri, 30 Nov 2018 11:26:01 +0100
Subject: [PATCH] Update Python to 3.7.1 and dependencies

All dependencies upgraded except:
- redis (3.0.1 not compatible with rq)
- WTForms

JIRA INFRA-684
---
 Dockerfile       |  2 +-
 README.rst       | 13 -------------
 requirements.txt | 38 +++++++++++++++++++-------------------
 3 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 11c5d35..b56b40a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6-slim as base
+FROM python:3.7-slim as base
 
 # Install Python dependencies in an intermediate image
 # as some requires a compiler (uwsgi)
diff --git a/README.rst b/README.rst
index 7c420de..4524565 100644
--- a/README.rst
+++ b/README.rst
@@ -80,16 +80,3 @@ To restore the database::
 
     $ gunzip -c csentry_db.sql.gz | docker run --rm --link csentry_postgres:postgres --net csentry_default
       -e PGPASSWORD="<csentry_password>" -i postgres:10 psql -h postgres -U ics csentry_db
-
-
-Dependencies
-------------
-
-The initial dependencies were generated using::
-
-    $ docker run --rm -it -v $(pwd):/app continuumio/miniconda3:latest bash
-    $ conda config --add channels conda-forge
-    $ conda create -n csentry python=3.6 flask alembic flask-debugtoolbar flask-login flask-sqlalchemy flask-wtf pillow psycopg2 pytest pytest-cov qrcode whitenoise factory_boy flask-admin pyjwt ldap3 flask-mail flask-migrate flask-jwt-extended
-    $ source activate csentry
-    $ pip install flask-ldap3-login sqlalchemy-citext sqlalchemy-continuum pytest-factoryboy git+https://github.com/beenje/flask-bootstrap@4.0.0-beta.1.dev1
-    $ conda env export > /app/environment.yml
diff --git a/requirements.txt b/requirements.txt
index ff9c289..f8dc7b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,53 +1,53 @@
-alembic==1.0.0
+alembic==1.0.5
 ansible-tower-cli==3.3.0
 arrow==0.12.1
 blinker==1.4
-certifi==2018.4.16
+certifi==2018.11.29
 chardet==3.0.4
-click==6.7
-colorama==0.3.9
+Click==7.0
+colorama==0.4.1
 elasticsearch==6.3.1
 et-xmlfile==1.0.1
 Flask==1.0.2
-Flask-Admin==1.5.1
+Flask-Admin==1.5.2
 Flask-Caching==1.4.0
 Flask-DebugToolbar==0.10.1
-Flask-JWT-Extended==3.12.0
-flask-ldap3-login==0.9.14
+Flask-JWT-Extended==3.13.1
+flask-ldap3-login==0.9.16
 Flask-Login==0.4.1
 Flask-Mail==0.9.1
-Flask-Migrate==2.2.1
+Flask-Migrate==2.3.1
 Flask-Redis==0.3.0
 Flask-Session==0.3.1
 Flask-SQLAlchemy==2.3.2
 Flask-WTF==0.14.2
 idna==2.7
-itsdangerous==0.24
+itsdangerous==1.1.0
 jdcal==1.4
 Jinja2==2.10
 ldap3==2.5.1
 Mako==1.0.7
-MarkupSafe==1.0
-openpyxl==2.5.7
-Pillow==5.2.0
-psycopg2==2.7.5
+MarkupSafe==1.1.0
+openpyxl==2.5.12
+Pillow==5.3.0
+psycopg2==2.7.6.1
 pyasn1==0.4.4
 PyJWT==1.6.4
-python-dateutil==2.7.3
+python-dateutil==2.7.5
 python-editor==1.0.3
 PyYAML==3.13
 qrcode==6.0
 raven==6.9.0
 redis==2.10.6
-requests==2.19.1
+requests==2.20.1
 rq==0.12.0
 rq-dashboard==0.3.12
 six==1.11.0
-SQLAlchemy==1.2.10
+SQLAlchemy==1.2.14
 sqlalchemy-citext==1.3.post0
 SQLAlchemy-Continuum==1.3.6
-SQLAlchemy-Utils==0.33.3
-urllib3==1.23
+SQLAlchemy-Utils==0.33.8
+urllib3==1.24.1
 Werkzeug==0.14.1
-whitenoise==3.3.1
+whitenoise==4.1.2
 WTForms==2.1
-- 
GitLab