Drop support for Python 2.6

This commit is contained in:
Julian Berman 2015-11-30 07:58:43 -05:00
parent 3eb5de857f
commit aa2cd272c8
5 changed files with 8 additions and 17 deletions

View File

@ -10,7 +10,7 @@ jsonschema
==========
``jsonschema`` is an implementation of `JSON Schema <http://json-schema.org>`_
for Python (supporting 2.6+ including Python 3).
for Python (supporting 2.7+ including Python 3).
.. code-block:: python

View File

@ -7,7 +7,7 @@ jsonschema
``jsonschema`` is an implementation of `JSON Schema <http://json-schema.org>`_
for Python (supporting 2.6+ including Python 3).
for Python (supporting 2.7+ including Python 3).
.. code-block:: python

View File

@ -8,7 +8,6 @@ except ImportError:
from collections.abc import MutableMapping, Sequence # noqa
PY3 = sys.version_info[0] >= 3
PY26 = sys.version_info[:2] == (2, 6)
if PY3:
zip = zip
@ -33,10 +32,7 @@ else:
int_types = int, long
iteritems = operator.methodcaller("iteritems")
if PY26:
from repoze.lru import lru_cache
else:
from functools32 import lru_cache
from functools32 import lru_cache
# On python < 3.3 fragments are not handled properly with unknown schemes

View File

@ -13,7 +13,6 @@ classifiers = [
"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.4",
@ -23,7 +22,6 @@ classifiers = [
extras_require = {
"format" : ["rfc3987", "strict-rfc3339", "webcolors"],
":python_version=='2.6'": ["argparse", "repoze.lru"],
":python_version=='2.7'": ["functools32"],
}

13
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = py{26,27,34,py,py3}, docs, style
envlist = py{27,34,py,py3}, docs, style
[testenv]
@ -10,11 +10,10 @@ whitelist_externals =
sh
virtualenv
commands =
py26: sh -c 'cd {envtmpdir}; {envbindir}/trial [] jsonschema'
py{27,34,py,py3}: {envbindir}/green [] jsonschema
{envpython} -m doctest {toxinidir}/README.rst
py{26,27,34}: {envbindir}/sphinx-build -b doctest {toxinidir}/docs {envtmpdir}/html
py{27,34}: {envbindir}/sphinx-build -b doctest {toxinidir}/docs {envtmpdir}/html
# Check to make sure that releases build and install properly
virtualenv --quiet --python=python2.7 {envtmpdir}/venv
@ -29,14 +28,12 @@ commands =
deps =
-e{toxinidir}[format]
py26: twisted
py{27,34,py,py3}: green
py26: unittest2
py{26,27,py,py3}: mock
py{27,py,py3}: mock
py{26,27,34}: lxml
py{26,27,34,py}: sphinx
py{27,34}: lxml
py{27,34,py}: sphinx
[testenv:coverage]