From 6686ac173011a302c26c4aedbd992f96d6e58357 Mon Sep 17 00:00:00 2001
From: Eric Brown <ericwb@users.noreply.github.com>
Date: Tue, 24 Jul 2018 07:44:37 -0700
Subject: [PATCH] Add official Python 3.7 support (#4717)

* Add official Python 3.7 support

Python 3.7 was just released [1]. This is a small change to
enable support in requests.

Signed-off-by: Eric Brown <browne@vmware.com>
---
 .travis.yml  | 35 ++++++++++++++++++++++++-----------
 appveyor.yml |  5 +++++
 setup.py     |  1 +
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aae4b560..efb75dde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,5 @@
 sudo: false
 language: python
-python:
-  # - "2.6"
-  - "2.7"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7-dev"
-  # - "pypy"  -- appears to hang
-  # - "pypy3"
 # command to install dependencies
 install: "make"
 # command to run tests
@@ -21,9 +12,31 @@ jobs:
   include:
     - stage: test
       script:
-        - |
-          if [[ "$TRAVIS_PYTHON_VERSION" != "2.6" ]] ; then make test-readme; fi
+        - make test-readme
         - make ci
+      python: '2.7'
+    - stage: test
+      script:
+        - make test-readme
+        - make ci
+      python: '3.4'
+    - stage: test
+      script:
+        - make test-readme
+        - make ci
+      python: '3.5'
+    - stage: test
+      script:
+        - make test-readme
+        - make ci
+      python: '3.6'
+    - stage: test
+      script:
+        - make test-readme
+        - make ci
+      python: '3.7'
+      dist: xenial
+      sudo: true     
     - stage: coverage
       python: 3.6
       script: codecov
diff --git a/appveyor.yml b/appveyor.yml
index d3f3ca19..5e310d5a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,11 @@ environment:
       PYTHON_ARCH: "64"
       TOXENV: "py36"
 
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.x"
+      PYTHON_ARCH: "64"
+      TOXENV: "py37"
+
 install:
   # Install Python (from the official .msi of http://python.org) and pip when
   # not already installed.
diff --git a/setup.py b/setup.py
index 4b211091..f47f15d3 100755
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,7 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy'
     ),