From f377aa3ed20ad4c7473948a750173df155b4eb92 Mon Sep 17 00:00:00 2001
From: Samuel Dion-Girardeau <samueldg@users.noreply.github.com>
Date: Mon, 25 Nov 2019 11:58:29 -0500
Subject: [PATCH] Add support for Python 3.8 (#115)

* Remove Travis Python 3.7 hack

No longer necessary: 3.7 is supported out-of-the-box

* Add support for Python 3.8

And explicitly document in setup.py

* "Upgrade base Docker image to Python 3.8"a

* Add entry about py38 support in WIP changelog

* Explicitly declare python versions in setup.py

* Bump Werkzeug to 0.15.6

This is the latest 0.15 version. 0.16 might be incompatible

The fix we are looking for is in [0.15.5](http://werkzeug.palletsprojects.com/en/0.15.x/changes/#version-0-15-5):

> Fix a TypeError due to changes to ast.Module in Python 3.8.
---
 .travis.yml      | 7 ++-----
 CHANGELOG.rst    | 1 +
 Dockerfile       | 2 +-
 requirements.txt | 2 +-
 setup.py         | 2 ++
 tox.ini          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5366860..b16e97b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,8 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-matrix:
-  include:
-    - python: 3.7
-      dist: xenial
-      sudo: true
+  - "3.7"
+  - "3.8"
 cache: pip
 install:
   - pip install tox-travis
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fc7f1dd..60ae540 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,7 @@ Version 1.5.0 (in development)
 * The ``URL_PREFIX`` environment variable can be used to add a prefix to URLs,
   which is useful when running behind a reverse proxy like nginx.
 * Replaced mockredis with fakeredis in the unit test environment.
+* Added support for Python 3.8.
 
 Version 1.4.2
 -------------
diff --git a/Dockerfile b/Dockerfile
index a5347fb..d8cccbc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-slim
+FROM python:3.8-slim
 
 ENV APP_DIR=/usr/src/snappass
 
diff --git a/requirements.txt b/requirements.txt
index 1ce0e36..e8345c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 Flask==1.0.2
 Jinja2==2.10.1
 MarkupSafe==1.0
-Werkzeug==0.15.3
+Werkzeug==0.15.6
 itsdangerous==0.24
 redis==2.10.6
 cryptography==2.3.1
diff --git a/setup.py b/setup.py
index a58f597..cb49f8f 100644
--- a/setup.py
+++ b/setup.py
@@ -18,6 +18,7 @@ setup(
         ],
     },
     include_package_data=True,
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -32,6 +33,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index 2d94fd2..cf899d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, py37, flake8
+envlist = py27, py34, py35, py36, py37, py38, flake8
 
 [testenv]
 setenv =