Merge branch 'remove-26deps' into develop

* remove-26deps:
  Update tox to run 3.4
  Remove unused imports
  Update changelog with latest changes
  Remove unused imports for 2.6

Author: jamesls

CHANGELOG.rst

@@ -1,3 +1,21 @@
+0.7.1
+=====
+
+* Rename ``bin/jp`` to ``bin/jp.py``
+* Fix issue with precedence when parsing wildcard
+  projections
+* Remove ordereddict and simplejson as py2.6 dependencies.
+  These were never actually used in the jmespath code base,
+  only in the unit tests.  Unittests requirements are handled
+  via requirements26.txt.
+
+
+0.7.0
+=====
+
+* Add support for JEP-12, raw string literals
+* Support .whl files
+
 0.6.2
 =====
 

jmespath/compat.py

@@ -54,11 +54,3 @@ def get_methods(cls):
         for name, method in inspect.getmembers(cls,
                                                predicate=inspect.isfunction):
             yield name, method
-
-
-if sys.version_info[:2] == (2, 6):
-    from ordereddict import OrderedDict
-    import simplejson as json
-else:
-    from collections import OrderedDict
-    import json

jmespath/functions.py

@@ -1,4 +1,3 @@
-import inspect
 import math
 import json
 import weakref

setup.py

@@ -7,22 +7,6 @@
 from setuptools import setup, find_packages
 
 
-requires = []
-
-
-if sys.version_info[:2] == (2, 6):
-    # For python2.6 we have a few other dependencies.
-    # First we need an ordered dictionary so we use the
-    # 2.6 backport.
-    requires.append('ordereddict==1.1')
-    # Then we need simplejson.  This is because we need
-    # a json version that allows us to specify we want to
-    # use an ordereddict instead of a normal dict for the
-    # JSON objects.  The 2.7 json module has this.  For 2.6
-    # we need simplejson.
-    requires.append('simplejson==3.3.0')
-
-
 setup(
     name='jmespath',
     version='0.7.0',
@@ -33,7 +17,6 @@
     url='https://github.com/jmespath/jmespath.py',
     scripts=['bin/jp.py'],
     packages=find_packages(exclude=['tests']),
-    install_requires=requires,
     classifiers=(
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py32,py33
+envlist = py26,py27,py33,py34
 
 [testenv]
 commands = nosetests