openstack/deb-python-jsonschema
Code Issues Proposed changes

Drop support for Python 2.6

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@@ -10,7 +10,7 @@ jsonschema
========== ==========
``jsonschema`` is an implementation of `JSON Schema <http://json-schema.org>`_ ``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 .. code-block:: python

2
docs/index.rst
View File

@@ -7,7 +7,7 @@ jsonschema
``jsonschema`` is an implementation of `JSON Schema <http://json-schema.org>`_ ``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 .. code-block:: python

6
jsonschema/compat.py
View File

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

2
setup.py
View File

@@ -13,7 +13,6 @@ classifiers = [
"Operating System :: OS Independent", "Operating System :: OS Independent",
"Programming Language :: Python", "Programming Language :: Python",
"Programming Language :: Python :: 2", "Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7", "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.4",
@@ -23,7 +22,6 @@ classifiers = [
extras_require = { extras_require = {
"format" : ["rfc3987", "strict-rfc3339", "webcolors"], "format" : ["rfc3987", "strict-rfc3339", "webcolors"],
":python_version=='2.6'": ["argparse", "repoze.lru"],
":python_version=='2.7'": ["functools32"], ":python_version=='2.7'": ["functools32"],
} }

13
tox.ini
View File

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