diff --git a/.travis.yml b/.travis.yml index 701eb6da..7247df5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,6 @@ matrix: - env: TOXENV=csslint before_install: npm install -g csslint # Python version specific - - python: '3.4' - env: TOXENV=py34-integration - - python: '3.4' - env: TOXENV=py34-min-req - - python: '3.4' - env: TOXENV=py34-unittests - python: '3.5' env: TOXENV=py35-integration - python: '3.5' diff --git a/appveyor.yml b/appveyor.yml index 995d64e9..23c87a17 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,6 @@ build: false environment: matrix: - - TOXENV: py34-integration - - TOXENV: py34-min-req - - TOXENV: py34-unittests - TOXENV: py35-integration - TOXENV: py35-min-req - TOXENV: py35-unittests diff --git a/docs/about/release-notes.md b/docs/about/release-notes.md index b833e6db..7a3e0728 100644 --- a/docs/about/release-notes.md +++ b/docs/about/release-notes.md @@ -56,6 +56,7 @@ your global navigation uses more than one level, things will likely be broken. ### Other Changes and Additions to Version 1.1 +* Drop support for Python 3.4. * Drop support for Python 2.7. MkDocs is PY3 only now (#1926). * Bugfix: Select appropriate asyncio event loop on Windows for Python 3.8+ (#1885). * Bugfix: Ensure nested index pages do not get identified as the homepage (#1919). diff --git a/setup.py b/setup.py index 10c90f4b..45e5a149 100755 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ setup( 'PyYAML>=3.10', 'tornado>=5.0' ], - python_requires='>=3.4', + python_requires='>=3.5', entry_points={ 'console_scripts': [ 'mkdocs = mkdocs.__main__:cli', @@ -84,7 +84,6 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', '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 2a26dc88..1c1530f9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,18 @@ [tox] envlist = - py{34,35,36,37,py3}-{unittests,integration,min-req}, + py{35,36,37,py3}-{unittests,integration,min-req}, flake8, markdown-lint, linkchecker, jshint, csslint [testenv] passenv = LANG deps= - py{34,35,36,37,py3}-{unittests,integration}: -rrequirements/project.txt - py{34,35,36,37,py3}-min-req: -rrequirements/project-min.txt - py{34,35,36,37,py3}-{unittests,min-req}: -rrequirements/test.txt + py{35,36,37,py3}-{unittests,integration}: -rrequirements/project.txt + py{35,36,37,py3}-min-req: -rrequirements/project-min.txt + py{35,36,37,py3}-{unittests,min-req}: -rrequirements/test.txt commands= {envpython} --version - py{34,35,36,37,py3}-{unittests,min-req}: {envbindir}/nosetests --with-coverage --cover-package mkdocs mkdocs - py{34,35,36,37,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds + py{35,36,37,py3}-{unittests,min-req}: {envbindir}/nosetests --with-coverage --cover-package mkdocs mkdocs + py{35,36,37,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds [testenv:flake8] deps=-rrequirements/test.txt