diff --git a/.travis.yml b/.travis.yml index 97bb52c355..530dd52453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,6 @@ matrix: - env: TOXENV=csslint before_install: npm install -g csslint # Python version specific - - python: '2.6' - env: TOXENV=py26-integration - - python: '2.6' - env: TOXENV=py26-min-req - - python: '2.6' - env: TOXENV=py26-unittests - python: '2.7' env: TOXENV=py27-integration - python: '2.7' diff --git a/docs/about/release-notes.md b/docs/about/release-notes.md index 437cd3652e..107a26609f 100644 --- a/docs/about/release-notes.md +++ b/docs/about/release-notes.md @@ -29,7 +29,7 @@ TODO... ### Other Changes and Additions to Version 1.0.0 -TODO... +* Support for Python 2.6 has been dropped (#165) ## Version 0.16.3 (2017-04-04) diff --git a/docs/index.md b/docs/index.md index 28e28f275e..d7e3eb8aec 100644 --- a/docs/index.md +++ b/docs/index.md @@ -68,7 +68,7 @@ $ pip --version pip 1.5.2 ``` -MkDocs supports Python versions 2.6, 2.7, 3.3, 3.4, 3.5 and pypy. +MkDocs supports Python versions 2.7, 3.3, 3.4, 3.5 and pypy. #### Installing Python diff --git a/mkdocs/relative_path_ext.py b/mkdocs/relative_path_ext.py index a8c41ed42e..253d6784ca 100644 --- a/mkdocs/relative_path_ext.py +++ b/mkdocs/relative_path_ext.py @@ -51,12 +51,6 @@ log = logging.getLogger(__name__) -def _iter(node): - # TODO: Remove when dropping Python 2.6. Replace this - # function call with note.iter() - return [node] + node.findall('.//*') - - def path_to_url(url, nav, strict): scheme, netloc, path, params, query, fragment = ( @@ -116,7 +110,7 @@ def run(self, root): tags and then makes them relative based on the site navigation """ - for element in _iter(root): + for element in root.iter(): if element.tag == 'a': key = 'href' diff --git a/setup.py b/setup.py index cdafa1ddea..49273d8fa8 100755 --- a/setup.py +++ b/setup.py @@ -7,8 +7,6 @@ import os import sys -PY26 = sys.version_info[:2] == (2, 6) - long_description = ( "MkDocs is a fast, simple and downright gorgeous static site generator " @@ -61,7 +59,7 @@ def get_packages(package): 'click>=3.3', 'Jinja2>=2.7.1', 'livereload>=2.5.1', - 'Markdown>=2.3.1,<2.5' if PY26 else 'Markdown>=2.3.1', + 'Markdown>=2.3.1', 'PyYAML>=3.10', 'tornado>=4.1', ], @@ -83,7 +81,6 @@ def get_packages(package): 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', diff --git a/tox.ini b/tox.ini index 9066992e79..f751ccb44a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,17 @@ [tox] envlist = - py{26,27,33,34,35}-{unittests,integration,min-req}, + py{27,33,34,35}-{unittests,integration,min-req}, flake8, markdown-lint, linkchecker, jshint, csslint [testenv] passenv = LANG deps= - py{26,27,33,34,35,py,py3}-{unittests,integration}: -rrequirements/project.txt - py{26,27,33,34,35,py,py3}-min-req: -rrequirements/project-min.txt - py{26,27,33,34,35,py,py3}-{unittests,min-req}: -rrequirements/test.txt + py{27,33,34,35,py,py3}-{unittests,integration}: -rrequirements/project.txt + py{27,33,34,35,py,py3}-min-req: -rrequirements/project-min.txt + py{27,33,34,35,py,py3}-{unittests,min-req}: -rrequirements/test.txt commands= - py{26,27,33,34,35,py,py3}-{unittests,min-req}: {envbindir}/nosetests --with-coverage --cover-package mkdocs mkdocs - py{26,27,33,34,35,py,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds + py{27,33,34,35,py,py3}-{unittests,min-req}: {envbindir}/nosetests --with-coverage --cover-package mkdocs mkdocs + py{27,33,34,35,py,py3}-integration: {envpython} -m mkdocs.tests.integration --output={envtmpdir}/builds [testenv:flake8] basepython = python2.7