From d6449f90808b50979694a3e91b49b532f3bf785d Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 3 Apr 2018 13:47:16 -0400 Subject: [PATCH] Drop official support for Python 3.3. Also up tornado version to >=5.0. Fixes #1427. --- .travis.yml | 6 ------ appveyor.yml | 3 --- docs/about/release-notes.md | 5 +++++ docs/index.md | 2 +- requirements/project.txt | 2 +- setup.py | 4 ++-- tox.ini | 12 ++++++------ 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44b31225..c82fab55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,6 @@ matrix: env: TOXENV=py27-min-req - python: '2.7' env: TOXENV=py27-unittests - - python: '3.3' - env: TOXENV=py33-integration - - python: '3.3' - env: TOXENV=py33-min-req - - python: '3.3' - env: TOXENV=py33-unittests - python: '3.4' env: TOXENV=py34-integration - python: '3.4' diff --git a/appveyor.yml b/appveyor.yml index 249cbd25..515ad6fc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,6 @@ environment: - TOXENV: py27-integration - TOXENV: py27-min-req - TOXENV: py27-unittests - - TOXENV: py33-integration - - TOXENV: py33-min-req - - TOXENV: py33-unittests - TOXENV: py34-integration - TOXENV: py34-min-req - TOXENV: py34-unittests diff --git a/docs/about/release-notes.md b/docs/about/release-notes.md index 5b67206b..e5a2abaf 100644 --- a/docs/about/release-notes.md +++ b/docs/about/release-notes.md @@ -47,6 +47,7 @@ authors should review how [search and themes] interact. ### Other Changes and Additions to Development Version +* Drop official support for Python 3.3 and set `tornado>=5.0` (#1427). * Add support for GitLab edit links (#1435). * Link to GitHub issues from release notes (#644). * Expand {sha} and {version} in gh-deploy commit message (#1410). @@ -66,6 +67,10 @@ authors should review how [search and themes] interact. * Update links to Python-Markdown library (#1360). * Document how to generate manpages for MkDocs commands (#686). +## Version 0.17.3 (2018-03-07) + +* Bugfix: Set dependency `tornado>=4.1,<5.0` due to changes in 5.0 (#1428). + ## Version 0.17.2 (2017-11-15) * Bugfix: Correct `extra_*` config setting regressions (#1335 & #1336). diff --git a/docs/index.md b/docs/index.md index 3c70c5d4..e832d40b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -68,7 +68,7 @@ $ pip --version pip 1.5.2 ``` -MkDocs supports Python versions 2.7, 3.3, 3.4, 3.5, 3.6 and pypy. +MkDocs supports Python versions 2.7, 3.4, 3.5, 3.6 and pypy. #### Installing Python diff --git a/requirements/project.txt b/requirements/project.txt index 49b49436..418d72c1 100644 --- a/requirements/project.txt +++ b/requirements/project.txt @@ -3,5 +3,5 @@ Jinja2>=2.7.1 livereload>=2.5.1 Markdown>=2.5 PyYAML>=3.10 -tornado>=4.1 +tornado>=5.0 mdx_gh_links>=0.2 diff --git a/setup.py b/setup.py index 9b4346d9..0a52f05d 100755 --- a/setup.py +++ b/setup.py @@ -61,8 +61,9 @@ setup( 'livereload>=2.5.1', 'Markdown>=2.3.1', 'PyYAML>=3.10', - 'tornado>=4.1', + 'tornado>=5.0', ], + python_requires='>=2.7.9,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', entry_points={ 'console_scripts': [ 'mkdocs = mkdocs.__main__:cli', @@ -86,7 +87,6 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', diff --git a/tox.ini b/tox.ini index 131de3db..52d0d7e0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,18 @@ [tox] envlist = - py{27,33,34,35,36}-{unittests,integration,min-req}, + py{27,34,35,36}-{unittests,integration,min-req}, flake8, markdown-lint, linkchecker, jshint, csslint [testenv] passenv = LANG deps= - py{27,33,34,35,36,py,py3}-{unittests,integration}: -rrequirements/project.txt - py{27,33,34,35,36,py,py3}-min-req: -rrequirements/project-min.txt - py{27,33,34,35,36,py,py3}-{unittests,min-req}: -rrequirements/test.txt + py{27,34,35,36,py,py3}-{unittests,integration}: -rrequirements/project.txt + py{27,34,35,36,py,py3}-min-req: -rrequirements/project-min.txt + py{27,34,35,36,py,py3}-{unittests,min-req}: -rrequirements/test.txt commands= {envpython} --version - py{27,33,34,35,36,py,py3}-{unittests,min-req}: {envbindir}/nosetests --with-coverage --cover-package mkdocs mkdocs - py{27,33,34,35,36,py,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds + py{27,34,35,36,py,py3}-{unittests,min-req}: {envbindir}/nosetests --with-coverage --cover-package mkdocs mkdocs + py{27,34,35,36,py,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds [testenv:flake8] basepython = python2.7