From 14d1454bbff8ca35503705ea48bb76e2bce465fa Mon Sep 17 00:00:00 2001
From: Arthur Hamon <arthur@lumapps.com>
Date: Fri, 5 Jul 2019 23:27:13 +0200
Subject: [PATCH] test with latest urllib3

---
 .travis.yml | 7 +++----
 tox.ini     | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e26e4e8..50848d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ env:
     - TOX_SUFFIX="requests"
     - TOX_SUFFIX="httplib2"
     - TOX_SUFFIX="boto3"
-    - TOX_SUFFIX="urllib3121"
     - TOX_SUFFIX="urllib3"
     - TOX_SUFFIX="tornado4"
     - TOX_SUFFIX="aiohttp"
@@ -24,7 +23,7 @@ matrix:
     - env: TOX_SUFFIX="httplib2"
       python: 3.7
       dist: xenial
-    - env: TOX_SUFFIX="urllib3121"
+    - env: TOX_SUFFIX="urllib3"
       python: 3.7
       dist: xenial
     - env: TOX_SUFFIX="tornado4"
@@ -46,9 +45,9 @@ matrix:
     - env: TOX_SUFFIX="flakes"
       python: "pypy3.5-5.9.0"
     - env: TOX_SUFFIX="aiohttp"
-      python: "2.7"
+      python: 2.7
     - env: TOX_SUFFIX="aiohttp"
-      python: "pypy2.7-7.0"
+      python: pypy
 python:
 - 2.7
 - 3.5
diff --git a/tox.ini b/tox.ini
index 5f0afd4..e4a4274 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,py36,py37,pypy}-{flakes,requests,httplib2,urllib3121,tornado4,boto3},{py35,py36,py37}-{aiohttp}
+envlist = {py27,py35,py36,py37,pypy}-{flakes,requests,httplib2,urllib3,tornado4,boto3},{py35,py36,py37}-{aiohttp}
 
 [testenv:flakes]
 skipsdist = True
@@ -21,12 +21,12 @@ deps =
     ipaddress
     requests: requests>=2.22.0
     httplib2: httplib2
-    urllib3121: urllib3==1.21.1
     urllib3: urllib3
     {py27,py35,py36,pypy}-tornado4: tornado>=4,<5
     {py27,py35,py36,pypy}-tornado4: pytest-tornado
     {py27,py35,py36}-tornado4: pycurl
     boto3: boto3
+    boto3: urllib3
     aiohttp: aiohttp
     aiohttp: pytest-asyncio
     aiohttp: pytest-aiohttp