Skip to content

Commit

Permalink
Drop support for Python 2.6.
Browse files Browse the repository at this point in the history
MkDocs most likley will no longer run on Python 2.6. All relevant tests
have been removed. Closes mkdocs#165.
  • Loading branch information
waylan committed Sep 28, 2017
1 parent a4a1fb9 commit 812c68b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 25 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion docs/about/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 1 addition & 7 deletions mkdocs/relative_path_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down Expand Up @@ -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'
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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',
],
Expand All @@ -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',
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 812c68b

Please sign in to comment.