From 155d5aba821c82ca67e0e7b9e57fed09b674a486 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Fri, 8 Nov 2019 10:53:30 -0800
Subject: [PATCH] Update tox and CI.

We used to optionally support requests and CacheControl extras and we
tested some of the combinations in CI. This is all handled by / bundled
with pip now, so kill.
---
 .travis.yml | 24 ++++--------------------
 tox.ini     | 47 +++++++++++------------------------------------
 2 files changed, 15 insertions(+), 56 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89bba0372..332be2d6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,14 +133,6 @@ matrix:
       name: TOXENV=py27-subprocess
       script: tox -v -e py27-subprocess
 
-    - <<: *x-linux-27-shard
-      name: TOXENV=py27-requests
-      script: tox -v -e py27-requests
-
-    - <<: *x-linux-27-shard
-      name: TOXENV=py27-requests-cachecontrol
-      script: tox -v -e py27-requests-cachecontrol
-
     - <<: *x-linux-shard
       name: TOXENV=py35
       env:
@@ -159,14 +151,6 @@ matrix:
       name: TOXENV=py37
       script: tox -v -e py37
 
-    - <<: *x-linux-37-shard
-      name: TOXENV=py37-requests
-      script: tox -v -e py37-requests
-
-    - <<: *x-linux-37-shard
-      name: TOXENV=py37-requests-cachecontrol
-      script: tox -v -e py37-requests-cachecontrol
-
     - <<: *x-linux-pypy-shard
       name: TOXENV=pypy
       script: tox -v -e pypy
@@ -184,12 +168,12 @@ matrix:
       script: tox -v -e pypy-integration
 
     - <<: *x-osx-27-shard
-      name: TOXENV=py27-requests
-      script: tox -v -e py27-requests
+      name: TOXENV=py27
+      script: tox -v -e py27
 
     - <<: *x-osx-37-shard
-      name: TOXENV=py37-requests
-      script: tox -v -e py37-requests
+      name: TOXENV=py37
+      script: tox -v -e py37
 
     - <<: *x-osx-27-shard
       name: TOXENV=py27-integration
diff --git a/tox.ini b/tox.ini
index 7debba89b..f2da20398 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 skip_missing_interpreters = True
 minversion = 1.8
 envlist =
-	py{py,27,37}-requests,style,isort-check,integration-tests
+	py{py,27,37},style,isort-check,integration-tests
 
 [testenv]
 commands =
@@ -15,11 +15,6 @@ deps =
     list-tests: mock==2.0.0
     py27: mock==2.0.0
     pypy: mock==2.0.0
-    run: requests
-    requests: requests
-    requests: responses
-    cachecontrol: CacheControl
-    cachecontrol: lockfile
     coverage: coverage==4.5.1
     subprocess: subprocess32
 passenv =
@@ -62,28 +57,16 @@ commands = python scripts/list_tests.py
 [testenv:py27-coverage]
 commands = {[integration]commands}
 
-[testenv:py27-requests-cachecontrol-coverage]
-commands = {[integration]commands}
-
 [testenv:py35-coverage]
 commands = {[integration]commands}
 
-[testenv:py35-requests-cachecontrol-coverage]
-commands = {[integration]commands}
-
 [testenv:py36-coverage]
 commands = {[integration]commands}
 
-[testenv:py36-requests-cachecontrol-coverage]
-commands = {[integration]commands}
-
 [testenv:py37-coverage]
 commands = {[integration]commands}
 
-[testenv:py37-requests-cachecontrol-coverage]
-commands = {[integration]commands}
-
-[testenv:pypy-requests-cachecontrol-coverage]
+[testenv:pypy-coverage]
 commands = {[integration]commands}
 
 [testenv:py27-coverage-simple]
@@ -104,10 +87,10 @@ deps =
 commands =
     # meta
     tox -e py27-coverage
-    tox -e py27-subprocess-requests-cachecontrol-coverage
-    tox -e py36-requests-cachecontrol-coverage
-    tox -e py36-coverage
-    tox -e pypy-subprocess-requests-cachecontrol-coverage
+    tox -e py27-subprocess-coverage
+    tox -e py37-coverage
+    tox -e pypy-coverage
+    tox -e pypy-subprocess-coverage
     python scripts/combine_coverage.py
     coverage report
     coverage html
@@ -142,8 +125,8 @@ commands = {[testenv:isort-run]commands} -c
 [testenv:vendor]
 deps =
   ansicolors==1.1.8
-  pip==18.1
-  redbaron==0.8
+  pip==19.3.1
+  redbaron==0.9.2
   {[testenv:isort-run]deps}
 commands =
   python -m pex.vendor
@@ -181,26 +164,18 @@ commands =
     --cache-dir {envtmpdir}/buildcache \
     --interpreter-constraint=">=3.4,<4" \
     --interpreter-constraint="==2.7.*" \
+    --no-compile \
+    --no-use-system-time \
     --python-shebang="/usr/bin/env python" \
     -o dist/pex \
     -c pex \
-    requests .
+    .
 
 # Would love if you didn't have to enumerate environments here :-\
 [testenv:py27]
-[testenv:py27-requests]
-[testenv:py27-requests-cachecontrol]
 [testenv:py27-subprocess]
 [testenv:py35]
-[testenv:py35-requests]
-[testenv:py35-requests-cachecontrol]
 [testenv:py36]
-[testenv:py36-requests]
-[testenv:py36-requests-cachecontrol]
 [testenv:py37]
-[testenv:py37-requests]
-[testenv:py37-requests-cachecontrol]
 [testenv:pypy]
-[testenv:pypy-requests]
-[testenv:pypy-requests-cachecontrol]
 [testenv:pypy-subprocess]