Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Python 3.4 #1774

Merged
merged 1 commit into from Jan 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions .travis.yml
Expand Up @@ -40,8 +40,6 @@ matrix:
# Unit tests
- python: 2.7
env: NOX_SESSION=test-2.7
- python: 3.4
env: NOX_SESSION=test-3.4
- python: 3.5
env: NOX_SESSION=test-3.5
- python: 3.6
Expand All @@ -67,9 +65,6 @@ matrix:
- language: generic
os: osx
env: NOX_SESSION=test-2.7
- language: generic
os: osx
env: NOX_SESSION=test-3.4
- language: generic
os: osx
env: NOX_SESSION=test-3.5
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.rst
@@ -1,6 +1,12 @@
Changes
=======

dev
---

* Drop support for EOL Python 3.4 (Pull #1774)


1.25.7 (2019-11-11)
-------------------

Expand Down
1 change: 0 additions & 1 deletion _travis/install.sh
Expand Up @@ -21,7 +21,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
# Mac OS setup.
case "${NOX_SESSION}" in
test-2.7) MACPYTHON=2.7.16 ;;
test-3.4) MACPYTHON=3.4.4 ;;
test-3.5) MACPYTHON=3.5.4 ;; # last binary release
test-3.6) MACPYTHON=3.6.8 ;; # last binary release
test-3.7) MACPYTHON=3.7.4 ;;
Expand Down
5 changes: 0 additions & 5 deletions appveyor.yml
Expand Up @@ -12,11 +12,6 @@ environment:
PYTHON_ARCH: "64"
NOX_SESSION: "test-2.7"

- PYTHON: "C:\\Python34-x64"
PYTHON_VERSION: "3.4.x"
PYTHON_ARCH: "64"
NOX_SESSION: "test-3.4"

- PYTHON: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.x"
PYTHON_ARCH: "64"
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Expand Up @@ -39,7 +39,7 @@ def tests_impl(session, extras="socks,secure,brotli"):
session.run("coverage", "report", "-m")


@nox.session(python=["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "pypy"])
@nox.session(python=["2.7", "3.5", "3.6", "3.7", "3.8", "pypy"])
def test(session):
tests_impl(session)

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Expand Up @@ -37,7 +37,6 @@
"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",
Expand Down Expand Up @@ -68,7 +67,7 @@
],
package_dir={"": "src"},
requires=[],
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4",
tests_require=[
# These are a less-specific subset of dev-requirements.txt, for the
# convenience of distro package maintainers.
Expand Down
2 changes: 1 addition & 1 deletion test/__init__.py
Expand Up @@ -130,7 +130,7 @@ def wrapper(*args, **kwargs):


def notOpenSSL098(test):
"""Skips this test for Python 3.4 and 3.5 macOS python.org distributions"""
"""Skips this test for Python 3.5 macOS python.org distribution"""

@six.wraps(test)
def wrapper(*args, **kwargs):
Expand Down