Disable requests[security] and remove 3.5 support references

psf · Jul 9, 2021 · f6c0619 · f6c0619
1 parent 33cf965
commit f6c0619
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,7  9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
         python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
         os: [ubuntu-18.04, macOS-latest, windows-latest]
         include:
           # pypy3 on Mac OS currently fails trying to compile

diff --git a/HISTORY.md b/HISTORY.md
@@ -24,6  24,13 @@ dev
 
   Python2 still depends upon the `chardet` module.
 
 **Deprecations**
 
 - The `requests[security]` extra has been converted to a no-op install.
   PyOpenSSL is no longer the recommended secure option for Requests.
 
 - Requests has officially dropped support for Python 3.5.
 
 2.25.1 (2020-12-16)
 -------------------
 

diff --git a/README.md b/README.md
@@ -33,7  33,7 @@ Requests is available on PyPI:
 $ python -m pip install requests
 ```
 
-Requests officially supports Python 2.7 & 3.5 .
 Requests officially supports Python 2.7 & 3.6 .
 
 ## Supported Features & Best–Practices
 

diff --git a/docs/community/faq.rst b/docs/community/faq.rst
@@ -55,7  55,7 @@ Chris Adams gave an excellent summary on
 Python 3 Support?
 -----------------
 
-Yes! Requests officially supports Python 2.7 & 3.5  and PyPy.
 Yes! Requests officially supports Python 2.7 & 3.6  and PyPy.
 
 Python 2 Support?
 -----------------

diff --git a/docs/index.rst b/docs/index.rst
@@ -68,7  68,7 @@ Requests is ready for today's web.
 - Chunked Requests
 - ``.netrc`` Support
 
-Requests officially supports Python 2.7 & 3.5 , and runs great on PyPy.
 Requests officially supports Python 2.7 & 3.6 , and runs great on PyPy.
 
 
 The User Guide

diff --git a/setup.py b/setup.py
@@ -78,7  78,7 @@ def run_tests(self):
     package_data={'': ['LICENSE', 'NOTICE']},
     package_dir={'requests': 'requests'},
     include_package_data=True,
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*",
     install_requires=requires,
     license=about['__license__'],
     zip_safe=False,
@@ -91,7  91,6 @@ def run_tests(self):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
@@ -102,7  101,7 @@ def run_tests(self):
     cmdclass={'test': PyTest},
     tests_require=test_requirements,
     extras_require={
-        'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4'],
         'security': [],
         'socks': ['PySocks>=1.5.6, !=1.5.7'],
         'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton'],
         'use_chardet_on_py3': ['chardet>=3.0.2,<5']

diff --git a/tox.ini b/tox.ini
@@ -1,5  1,5 @@
 [tox]
-envlist = py{27,35,36,37,38}-{default,use_chardet_on_py3}
 envlist = py{27,36,37,38,39}-{default,use_chardet_on_py3}
 
 [testenv]
 deps = -rrequirements-dev.txt