Merge branch 'master' into feature/strip-utf8-bom

.gitignore

@@ -19,6 +19,7 @@ env/
 .tox/
 .pytest_cache/
 .vscode/
+.eggs/
 
 .workon
 

.travis.yml

@@ -3,36 +3,18 @@ language: python
 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:
   include:
     - stage: test
-      script:
-        - 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   
     - stage: coverage

AUTHORS.rst

@@ -189,3 +189,7 @@ Patches and Suggestions
 - Darren Dormer (`@ddormer <https://github.com/ddormer>`_)
 - Rajiv Mayani (`@mayani <https://github.com/mayani>`_)
 - Antti Kaihola (`@akaihola <https://github.com/akaihola>`_)
+- "Dull Bananas" <[email protected]> (`@dullbananas <https://github.com/dullbananas>`_)
+- Alessio Izzo (`@aless10 <https://github.com/aless10>`_)
+- Belavin Denis (`@luckydenis <https://github.com/luckydenis>`_)
+- Dull Bananas <[email protected]> (`@dullbananas <https://github.com/dullbananas>`_)

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)
 -------------------
 
@@ -537,7 +549,7 @@ Or, even better:
 
 **Bugfixes**
 
--   For file-like objects that are not seeked to the very beginning, we
+-   For file-like objects that are not sought to the very beginning, we
     now send the content length for the number of bytes we will actually
     read, rather than the total size of the file, allowing partial file
     uploads.
@@ -781,34 +793,34 @@ documentation](http://docs.python-requests.org/en/latest/community/release-proce
 -   Unicode URL improvements for Python 2.
 -   Re-order JSON param for backwards compat.
 -   Automatically defrag authentication schemes from host/pass URIs.
-    ([\#2249](https://github.com/requests/requests/issues/2249))
+    ([\#2249](https://github.com/psf/requests/issues/2249))
 
 2.4.2 (2014-10-05)
 ------------------
 
 **Improvements**
 
 -   FINALLY! Add json parameter for uploads!
-    ([\#2258](https://github.com/requests/requests/pull/2258))
+    ([\#2258](https://github.com/psf/requests/pull/2258))
 -   Support for bytestring URLs on Python 3.x
-    ([\#2238](https://github.com/requests/requests/pull/2238))
+    ([\#2238](https://github.com/psf/requests/pull/2238))
 
 **Bugfixes**
 
 -   Avoid getting stuck in a loop
-    ([\#2244](https://github.com/requests/requests/pull/2244))
+    ([\#2244](https://github.com/psf/requests/pull/2244))
 -   Multiple calls to iter\* fail with unhelpful error.
-    ([\#2240](https://github.com/requests/requests/issues/2240),
-    [\#2241](https://github.com/requests/requests/issues/2241))
+    ([\#2240](https://github.com/psf/requests/issues/2240),
+    [\#2241](https://github.com/psf/requests/issues/2241))
 
 **Documentation**
 
 -   Correct redirection introduction
-    ([\#2245](https://github.com/requests/requests/pull/2245/))
+    ([\#2245](https://github.com/psf/requests/pull/2245/))
 -   Added example of how to send multiple files in one request.
-    ([\#2227](https://github.com/requests/requests/pull/2227/))
+    ([\#2227](https://github.com/psf/requests/pull/2227/))
 -   Clarify how to pass a custom set of CAs
-    ([\#2248](https://github.com/requests/requests/pull/2248/))
+    ([\#2248](https://github.com/psf/requests/pull/2248/))
 
 2.4.1 (2014-09-09)
 ------------------

Pipfile

@@ -4,12 +4,12 @@ verify_ssl = true
 name = "pypi"
 
 [dev-packages]
-pytest = ">=2.8.0,<4.1"
+pytest = ">=2.8.0,<=3.10.1"
 codecov = "*"
-pytest-httpbin = ">=0.0.7"
+pytest-httpbin = ">=0.0.7,<1.0"
 pytest-mock = "*"
 pytest-cov = "*"
-pytest-xdist = "*"
+pytest-xdist = "<=1.25"
 alabaster = "*"
 readme-renderer = "*"
 sphinx = "<=1.5.5"