From 1753e9122edca9ac76e76dd25c4e774469bf809b Mon Sep 17 00:00:00 2001 From: PyYoshi Date: Mon, 18 Nov 2019 14:16:47 +0900 Subject: [PATCH] drop support for Python 3.4 https://devguide.python.org/devcycle/#end-of-life-branches --- .travis.yml | 2 -- CHANGES.rst | 1 + appveyor.yml | 3 --- dockerfiles/buildwheel.sh | 2 +- dockerfiles/develop/Dockerfile | 2 +- dockerfiles/slim/Dockerfile | 2 +- setup.py | 1 - tox.ini | 2 +- 8 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ebb921..6d79053 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,6 @@ matrix: include: - python: 2.7 env: TOXENV=py27 - - python: 3.4 - env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 diff --git a/CHANGES.rst b/CHANGES.rst index ab39286..9b0e1fc 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,7 @@ CHANGES - update language models (uchardet) - add iso8859-2 test but disabled it - support Python 3.8 +- drop support for Python 3.4 2.1.4 (2018-09-27) ------------------ diff --git a/appveyor.yml b/appveyor.yml index d827407..2c04b0b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,14 +1,11 @@ environment: matrix: - PYTHON: "C:\\Python27" - - PYTHON: "C:\\Python34" - PYTHON: "C:\\Python35" - PYTHON: "C:\\Python36" - PYTHON: "C:\\Python37" - PYTHON: "C:\\Python38" - PYTHON: "C:\\Python27-x64" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - PYTHON: "C:\\Python35-x64" - PYTHON: "C:\\Python36-x64" - PYTHON: "C:\\Python37-x64" diff --git a/dockerfiles/buildwheel.sh b/dockerfiles/buildwheel.sh index 81c60d5..89359c8 100755 --- a/dockerfiles/buildwheel.sh +++ b/dockerfiles/buildwheel.sh @@ -4,7 +4,7 @@ set -e -x ARCH=`uname -p` echo "arch=$ARCH" -for V in cp38-cp38m cp37-cp37m cp36-cp36m cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do +for V in cp38-cp38m cp37-cp37m cp36-cp36m cp35-cp35m cp27-cp27m cp27-cp27mu; do PYBIN=/opt/python/$V/bin rm -rf build src/cchardet/__pycache__ src/cchardet/*.cpp src/cchardet/*.pyc src/cchardet/*.so src/cchardet.egg-info src/tests/__pycache__ src/tests/*.pyc $PYBIN/pip install -r requirements-dev.txt diff --git a/dockerfiles/develop/Dockerfile b/dockerfiles/develop/Dockerfile index 75433cb..7377ec3 100644 --- a/dockerfiles/develop/Dockerfile +++ b/dockerfiles/develop/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.4-wheezy +FROM python:3.8-buster RUN pip install -U cython chardet nose diff --git a/dockerfiles/slim/Dockerfile b/dockerfiles/slim/Dockerfile index 2bc672c..cdf1916 100644 --- a/dockerfiles/slim/Dockerfile +++ b/dockerfiles/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.4-slim +FROM python:3.8-slim-buster ENV BUILD_DEPS gcc g++ diff --git a/setup.py b/setup.py index b7bee80..7127a5b 100644 --- a/setup.py +++ b/setup.py @@ -131,7 +131,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', diff --git a/tox.ini b/tox.ini index 6c31a32..41c8a9e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, py36, py37, py38, py39 +envlist = py27, py35, py36, py37, py38, py39 [testenv] commands =