From 08ef4a8bc4a8a2a692f58505fcd0dc260896bec8 Mon Sep 17 00:00:00 2001
From: Jair Henrique <jair.henrique@gmail.com>
Date: Tue, 6 Oct 2020 10:07:48 -0300
Subject: [PATCH] Drop support to deprecated Python (<3.6)

---
 .travis.yml           |  1 -
 docs/contributing.rst |  4 ++--
 setup.py              |  4 +---
 tox.ini               | 15 ++++++---------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2d0315..ac04622 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ matrix:
       python: "3.7"
 
 python:
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 80addf1..82cbeeb 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -130,10 +130,10 @@ in this example::
     pip install tox tox-pyenv
 
     # Install supported versions (at time of writing), this does not activate them
-    pyenv install 3.5.9 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0
+    pyenv install 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0
 
     # This activates them
-    pyenv local 3.5.9 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0
+    pyenv local 3.6.9 3.7.5 3.8.0 pypy3.6-7.2.0
 
     # Run the whole test suite
     tox
diff --git a/setup.py b/setup.py
index 0eece40..9403405 100644
--- a/setup.py
+++ b/setup.py
@@ -46,8 +46,7 @@ install_requires = [
     "PyYAML",
     "wrapt",
     "six>=1.5",
-    'yarl; python_version>="3.6"',
-    'yarl<1.4; python_version=="3.5"',
+    "yarl",
 ]
 
 setup(
@@ -70,7 +69,6 @@ setup(
         "Intended Audience :: Developers",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
diff --git a/tox.ini b/tox.ini
index d64f6fe..295fe09 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,12 +3,10 @@ skip_missing_interpreters=true
 envlist =
   cov-clean,
   lint,
-  {py35,py36,py37,py38}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp},
-  {py36,py37,py38}-{httpx}
+  {py36,py37,py38}-{requests,httplib2,urllib3,tornado4,boto3,aiohttp,httpx},
   {pypy3}-{requests,httplib2,urllib3,tornado4,boto3},
   cov-report
 
-
 # Coverage environment tasks: cov-clean and cov-report
 # https://pytest-cov.readthedocs.io/en/latest/tox.html
 [testenv:cov-clean]
@@ -63,7 +61,6 @@ usedevelop=true
 commands =
     ./runtests.sh --cov=./vcr --cov-branch --cov-report=xml --cov-append {posargs}
 deps =
-    Flask
     pytest
     pytest-httpbin
     pytest-cov
@@ -72,9 +69,9 @@ deps =
     requests: requests>=2.22.0
     httplib2: httplib2
     urllib3: urllib3
-    {py35,py36}-tornado4: tornado>=4,<5
-    {py35,py36}-tornado4: pytest-tornado
-    {py35,py36}-tornado4: pycurl
+    {py36}-tornado4: tornado>=4,<5
+    {py36}-tornado4: pytest-tornado
+    {py36}-tornado4: pycurl
     boto3: boto3
     boto3: urllib3
     aiohttp: aiohttp
@@ -84,8 +81,8 @@ deps =
     {py36,py37,py38}-{httpx}: httpx
     {py36,py37,py38}-{httpx}: pytest-asyncio
 depends =
-  lint,{py35,py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py35,py36,py37,py38}-{aiohttp},{py36,py37,py38}-{httpx}: cov-clean
-  cov-report: lint,{py35,py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py35,py36,py37,py38}-{aiohttp}
+  lint,{py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py36,py37,py38}-{aiohttp},{py36,py37,py38}-{httpx}: cov-clean
+  cov-report: lint,{py36,py37,py38,pypy3}-{requests,httplib2,urllib3,tornado4,boto3},{py36,py37,py38}-{aiohttp}
 passenv =
     AWS_ACCESS_KEY_ID
     AWS_DEFAULT_REGION