From 0b866ead22ef5b4b3ecf99c7471e09aab40a6aef Mon Sep 17 00:00:00 2001
From: Emmanuelle Vargas-Gonzalez <emmanuelle@mitre.org>
Date: Thu, 2 Jul 2020 15:56:55 -0400
Subject: [PATCH 1/2] drop Python versions older than 3.5

---
 .travis.yml | 8 +++-----
 setup.py    | 3 ---
 tox.ini     | 4 +---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a74e7c5..31efbe2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
-os: linux
+dist: focal
 language: python
 cache: pip
 services:
   - mongodb
 python:
-  - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
   - "3.7"
@@ -14,10 +12,10 @@ install:
   - pip install -U pip setuptools
   - pip install tox-travis
   - pip install codecov
-  - if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pip install pre-commit; fi
+  - pip install pre-commit
 script:
   - tox
-  - if [[ $TRAVIS_PYTHON_VERSION != 3.4 ]]; then pre-commit run --all-files; fi
+  - pre-commit run --all-files
 after_success:
   - codecov
 before_script:
diff --git a/setup.py b/setup.py
index 27c308b8..d9da385c 100644
--- a/setup.py
+++ b/setup.py
@@ -39,10 +39,7 @@ def get_long_description():
         "Intended Audience :: Developers",
         "Topic :: Security",
         "License :: OSI Approved :: BSD License",
-        "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",
diff --git a/tox.ini b/tox.ini
index 42ffbbf9..7d97bf11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,py37,py38,pycodestyle,isort-check,packaging
+envlist = py35,py36,py37,py38,pycodestyle,isort-check,packaging
 
 [testenv]
 deps =
@@ -42,8 +42,6 @@ commands =
 
 [travis]
 python =
-  2.7: py27, pycodestyle
-  3.4: py34, pycodestyle
   3.5: py35, pycodestyle
   3.6: py36, pycodestyle, isort-check, packaging
   3.7: py37, pycodestyle

From 01f3c6689477b6c8fe3c44e8f820b7f47fcf1460 Mon Sep 17 00:00:00 2001
From: Emmanuelle Vargas-Gonzalez <emmanuelle@mitre.org>
Date: Thu, 2 Jul 2020 16:01:20 -0400
Subject: [PATCH 2/2] we might not be ready yet for focal (20.04 LTS)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 31efbe2b..3d9383bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: focal
+dist: bionic
 language: python
 cache: pip
 services: