From f7a06851903485d8b26f6feb9744719d0454f1bf Mon Sep 17 00:00:00 2001
From: Lukas Puehringer <lukas.puehringer@nyu.edu>
Date: Fri, 13 Dec 2019 09:41:45 +0100
Subject: [PATCH] Update tested and supported Python versions

- Drop 3.4 (due to end-of-life) and add 3.7 and 3.8 to tox, travis
and appveyor configuration for automated testing.
- Adapt classifiers in setup.py accordingly.
- Add python_requires field in setup.py to reflect supported
versions. This will prevent pip from trying to install tuf on
a non-supported version.

Signed-off-by: Lukas Puehringer <lukas.puehringer@nyu.edu>
---
 .travis.yml  |  6 ++++--
 appveyor.yml | 12 ++++++++----
 setup.py     |  4 +++-
 tox.ini      |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8803765c97..08635fdcc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,14 @@ matrix:
   include:
     - python: "2.7"
       env: TOXENV=py27
-    - python: "3.4"
-      env: TOXENV=py34
     - python: "3.5"
       env: TOXENV=py35
     - python: "3.6"
       env: TOXENV=py36
+    - python: "3.7"
+      env: TOXENV=py37
+    - python: "3.8"
+      env: TOXENV=py38
     - python: "3.6"
       env: TOXENV=with-sslib-master
 
diff --git a/appveyor.yml b/appveyor.yml
index b2e00ed80b..209ade82e4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,13 @@
 environment:
   matrix:
+    - PYTHON: "C:\\Python38"
+      PYTHON_VERSION: 3.8
+      PYTHON_ARCH: 32
+
+    - PYTHON: "C:\\Python37"
+      PYTHON_VERSION: 3.7
+      PYTHON_ARCH: 32
+
     - PYTHON: "C:\\Python36"
       PYTHON_VERSION: 3.6
       PYTHON_ARCH: 32
@@ -8,10 +16,6 @@ environment:
       PYTHON_VERSION: 3.5
       PYTHON_ARCH: 32
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: 3.4
-      PYTHON_ARCH: 32
-
     - PYTHON: "C:\\Python27"
       PYTHON_VERSION: 2.7
       PYTHON_ARCH: 32
diff --git a/setup.py b/setup.py
index db9a94399a..1730f10597 100755
--- a/setup.py
+++ b/setup.py
@@ -103,13 +103,15 @@
     'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: Implementation :: CPython',
     'Topic :: Security',
     'Topic :: Software Development'
   ],
+  python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4",
   install_requires = [
     'iso8601>=0.1.12',
     'requests>=2.19.1',
diff --git a/tox.ini b/tox.ini
index 23cc775ee5..2e03026868 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py35, py36, py37, py38
 skipsdist = true
 
 [testenv]