diff --git a/.travis.yml b/.travis.yml index 6d79053..da33bc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ git: matrix: include: - - python: 2.7 - env: TOXENV=py27 - python: 3.5 env: TOXENV=py35 - python: 3.6 diff --git a/README.rst b/README.rst index 0f5a962..73b532c 100644 --- a/README.rst +++ b/README.rst @@ -234,17 +234,6 @@ RAM: DDR3 1600Mhz 16GB Platform: Ubuntu 16.04 amd64 -Python 2.7.13 -^^^^^^^^^^^^^ - -+-----------------+------------------+ -| | Request (call/s) | -+=================+==================+ -| chardet v3.0.2 | 0.36 | -+-----------------+------------------+ -| cchardet v2.0.1 | 1396.42 | -+-----------------+------------------+ - Python 3.6.1 ^^^^^^^^^^^^ diff --git a/appveyor.yml b/appveyor.yml index 2c04b0b..ce91e10 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,9 @@ environment: matrix: - - PYTHON: "C:\\Python27" - PYTHON: "C:\\Python35" - PYTHON: "C:\\Python36" - PYTHON: "C:\\Python37" - PYTHON: "C:\\Python38" - - PYTHON: "C:\\Python27-x64" - PYTHON: "C:\\Python35-x64" - PYTHON: "C:\\Python36-x64" - PYTHON: "C:\\Python37-x64" diff --git a/dockerfiles/buildwheel.sh b/dockerfiles/buildwheel.sh index 288b663..afc5646 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-cp38 cp37-cp37m cp36-cp36m cp35-cp35m cp27-cp27m cp27-cp27mu; do +for V in cp38-cp38 cp37-cp37m cp36-cp36m cp35-cp35m; 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/setup.py b/setup.py index 7127a5b..2443b42 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ if have_cython: pyx_sources = glob.glob(cchardet_dir + '*.pyx') sys.stderr.write('cythonize: %r\n' % (pyx_sources,)) cython_compiler.compile( - pyx_sources, options=cython_compiler.CompilationOptions(cplus=True)) + pyx_sources, options=cython_compiler.CompilationOptions(cplus=True, compiler_directives={"language_level": 3})) cchardet_sources = glob.glob(cchardet_dir + '*.cpp') sources = cchardet_sources @@ -128,8 +128,6 @@ setup( 'Programming Language :: Cython', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', diff --git a/tox.ini b/tox.ini index 41c8a9e..8be7421 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35, py36, py37, py38, py39 +envlist = py35, py36, py37, py38, py39 [testenv] commands =