From 68e581f1b5b4425a0ee950a2433fc3c92e671d0f Mon Sep 17 00:00:00 2001
From: Nate Prewitt <Nate.Prewitt@gmail.com>
Date: Wed, 15 May 2019 12:35:29 -0700
Subject: [PATCH] drop 3.4 support

---
 .travis.yml |  7 +------
 HISTORY.md  | 12 ++++++++++++
 setup.py    |  3 +--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 53833fb8..7f1c4968 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ install: "make"
 # command to run tests
 script:
   - |
-    if [[ "$TRAVIS_PYTHON_VERSION" != "2.6" ]] ; then make test-readme; fi
+    make test-readme
   - make ci
 cache: pip
 jobs:
@@ -14,11 +14,6 @@ jobs:
         - 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
diff --git a/HISTORY.md b/HISTORY.md
index 1d0bd073..0b1f9f5e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -8,6 +8,18 @@ dev
 
 -   \[Short description of non-trivial change.\]
 
+2.22.0 (2019-05-15)
+-------------------
+
+**Dependencies**
+
+- Requests now supports urllib3 v1.25.2.
+  (note: 1.25.0 and 1.25.1 are incompatible)
+
+**Deprecations**
+
+- Requests has officially stopped support for Python 3.4.
+
 2.21.0 (2018-12-10)
 -------------------
 
diff --git a/setup.py b/setup.py
index 10ce2c62..0b0a1ead 100755
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@ setup(
     package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']},
     package_dir={'requests': 'requests'},
     include_package_data=True,
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
     install_requires=requires,
     license=about['__license__'],
     zip_safe=False,
@@ -92,7 +92,6 @@ setup(
         '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',