From 5981884cd2c172f5f8678748f58561ad9aa8413e Mon Sep 17 00:00:00 2001 From: Samuel Dion-Girardeau Date: Thu, 12 Jul 2018 21:23:25 -0400 Subject: [PATCH 1/6] Update all Python requirements to latest stable All PyPI packages now have the latest version available. --- dev-requirements.txt | 8 ++++---- requirements.txt | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 8fa761f..81b6de0 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ -pytest==3.5.1 +pytest==3.6.3 pytest-cov==2.5.1 mockredispy==2.9.3 -coverage==4.2 -flake8==3.0.4 -tox==3.0.0 +coverage==4.5.1 +flake8==3.5.0 +tox==3.1.2 diff --git a/requirements.txt b/requirements.txt index c18fe8e..32eb1c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -Flask==0.11.1 -Jinja2==2.7.1 -MarkupSafe==0.18 -Werkzeug==0.9.4 -itsdangerous==0.23 -redis==2.8.0 -cryptography==1.8.1 -mock==1.0.1 +Flask==1.0.2 +Jinja2==2.10 +MarkupSafe==1.0 +Werkzeug==0.14.1 +itsdangerous==0.24 +redis==2.10.6 +cryptography==2.2.2 +mock==2.0.0 From 2c334fc19f59a985374d7915abd12816198528bb Mon Sep 17 00:00:00 2001 From: Samuel Dion-Girardeau Date: Thu, 12 Jul 2018 21:24:27 -0400 Subject: [PATCH 2/6] Update tests to run using Python 3.7 --- .travis.yml | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a1e848..d3ccf34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - "3.4" - "3.5" - "3.6" + - "3.7" sudo: false install: - pip install tox-travis diff --git a/tox.ini b/tox.ini index 4d42ed5..2d94fd2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, py36, flake8 +envlist = py27, py34, py35, py36, py37, flake8 [testenv] setenv = From 59196bea40b8d77f01d2d6d57212167870fb504d Mon Sep 17 00:00:00 2001 From: Samuel Dion-Girardeau Date: Thu, 12 Jul 2018 21:25:10 -0400 Subject: [PATCH 3/6] Update Trove classifier to include Python 3.7 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 139e23b..4845a9f 100644 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ setup( 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Software Development :: Libraries :: Python Modules', ], zip_safe=False, From 73c220be975c899a3e8440ddcf5eba92e449edde Mon Sep 17 00:00:00 2001 From: Samuel Dion-Girardeau Date: Thu, 12 Jul 2018 21:27:32 -0400 Subject: [PATCH 4/6] Update Docker image to Python 3.7 (current latest) Also used the "slim" version, which will drastically reduce the image size. Base image sizes comparison: | python:3.7-slim | 143MB | | python:3.7 | 916MB | --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ce87d9..a5347fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.6 +FROM python:3.7-slim ENV APP_DIR=/usr/src/snappass From 0f1cc0900cf98c1311798408d27a12e59cca1012 Mon Sep 17 00:00:00 2001 From: Samuel Dion-Girardeau Date: Thu, 12 Jul 2018 21:54:54 -0400 Subject: [PATCH 5/6] Align docs with actual base image pulled --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index ef0391e..af33790 100644 --- a/README.rst +++ b/README.rst @@ -104,7 +104,7 @@ Alternatively, you can use `Docker`_ and `Docker Compose`_ to install and run Sn $ docker-compose up -d -This will pull all dependencies, i.e. Redis and appropriate Python version (3.6), then start up SnapPass and Redis server. SnapPass server is accessible at: http://localhost:5000 +This will pull all dependencies, i.e. Redis and appropriate Python version (3.7), then start up SnapPass and Redis server. SnapPass server is accessible at: http://localhost:5000 We're Hiring! ------------- From 867dc24f83564c16c7820318f3346ade91218ce5 Mon Sep 17 00:00:00 2001 From: Samuel Dion-Girardeau Date: Sat, 14 Jul 2018 16:28:15 -0400 Subject: [PATCH 6/6] Temporarily disable Python 3.7 from Travis build Currently Travis doesn't support Python 3.7 yet, but this should be addressed soon: https://github.com/travis-ci/travis-ci/issues/9815 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3ccf34..0c88e89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ python: - "3.4" - "3.5" - "3.6" - - "3.7" + # - "3.7" # TODO: Re-enable after https://github.com/travis-ci/travis-ci/issues/9815 is fixed sudo: false install: - pip install tox-travis