Merge branch 'release-1.0.0' into master

Author: jamesls

.github/workflows/run-tests.yml

@@ -1,6 +1,6 @@
 name: Run Tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -9,12 +9,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -25,4 +25,4 @@ jobs:
         pip install dist/*.whl
     - name: Test with pytest
       run: |
-        cd tests/ && nosetests --with-coverage --cover-package jmespath .
+        cd tests/ && py.test --cov jmespath --cov-report term-missing

.travis.yml

@@ -6,14 +6,6 @@ JMESPath
    :target: https://gitter.im/jmespath/chat
 
 
-.. image:: https://travis-ci.org/jmespath/jmespath.py.svg?branch=develop
-    :target: https://travis-ci.org/jmespath/jmespath.py
-
-
-.. image:: https://codecov.io/github/jmespath/jmespath.py/coverage.svg?branch=develop
-    :target: https://codecov.io/github/jmespath/jmespath.py?branch=develop
-
-
 JMESPath (pronounced "james path") allows you to declaratively specify how to
 extract elements from a JSON document.
 

README.rst

@@ -38,7 +38,7 @@
 # The short X.Y version.
 version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.10.0'
+release = '1.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/conf.py

@@ -1,18 +1,7 @@
-import warnings
-import sys
 from jmespath import parser
 from jmespath.visitor import Options
 
-__version__ = '0.10.0'
-
-
-if sys.version_info[:2] <= (2, 6) or ((3, 0) <= sys.version_info[:2] <= (3, 3)):
-    python_ver = '.'.join(str(x) for x in sys.version_info[:3])
-
-    warnings.warn(
-        'You are using Python {0}, which will no longer be supported in '
-        'version 0.11.0'.format(python_ver),
-        DeprecationWarning)
+__version__ = '1.0.0'
 
 
 def compile(expression):

jmespath/__init__.py

@@ -1,65 +1,19 @@
 import sys
 import inspect
+from itertools import zip_longest
 
-PY2 = sys.version_info[0] == 2
 
+text_type = str
+string_type = str
 
-def with_metaclass(meta, *bases):
-    # Taken from flask/six.
-    class metaclass(meta):
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
 
+def with_str_method(cls):
+    # In python3, we don't need to do anything, we return a str type.
+    return cls
 
-if PY2:
-    text_type = unicode
-    string_type = basestring
-    from itertools import izip_longest as zip_longest
+def with_repr_method(cls):
+    return cls
 
-    def with_str_method(cls):
-        """Class decorator that handles __str__ compat between py2 and py3."""
-        # In python2, the __str__ should be __unicode__
-        # and __str__ should return bytes.
-        cls.__unicode__ = cls.__str__
-        def __str__(self):
-            return self.__unicode__().encode('utf-8')
-        cls.__str__ = __str__
-        return cls
-
-    def with_repr_method(cls):
-        """Class decorator that handle __repr__ with py2 and py3."""
-        # This is almost the same thing as with_str_method *except*
-        # it uses the unicode_escape encoding.  This also means we need to be
-        # careful encoding the input multiple times, so we only encode
-        # if we get a unicode type.
-        original_repr_method = cls.__repr__
-        def __repr__(self):
-            original_repr = original_repr_method(self)
-            if isinstance(original_repr, text_type):
-                original_repr = original_repr.encode('unicode_escape')
-            return original_repr
-        cls.__repr__ = __repr__
-        return cls
-
-    def get_methods(cls):
-        for name, method in inspect.getmembers(cls,
-                                               predicate=inspect.ismethod):
-            yield name, method
-
-else:
-    text_type = str
-    string_type = str
-    from itertools import zip_longest
-
-    def with_str_method(cls):
-        # In python3, we don't need to do anything, we return a str type.
-        return cls
-
-    def with_repr_method(cls):
-        return cls
-
-    def get_methods(cls):
-        for name, method in inspect.getmembers(cls,
-                                               predicate=inspect.isfunction):
-            yield name, method
+def get_methods(cls):
+    for name, method in inspect.getmembers(cls, predicate=inspect.isfunction):
+        yield name, method

jmespath/compat.py

@@ -3,7 +3,7 @@
 
 from jmespath import exceptions
 from jmespath.compat import string_type as STRING_TYPE
-from jmespath.compat import get_methods, with_metaclass
+from jmespath.compat import get_methods
 
 
 # python types -> jmespath types
@@ -64,7 +64,7 @@ def _populate_function_table(cls):
         cls.FUNCTION_TABLE = function_table
 
 
-class Functions(with_metaclass(FunctionRegistry, object)):
+class Functions(metaclass=FunctionRegistry):
 
     FUNCTION_TABLE = {
     }

jmespath/functions.py

@@ -1,8 +1,8 @@
-nose==1.2.1
-py==1.4.12
-tox==1.4.2
 wheel==0.24.0
-coverage==5.0.3 ; python_version == '3.8'
-coverage==3.7.1 ; python_version != '3.8'
-hypothesis==3.1.0 ; python_version != '3.8'
+pytest==6.2.5 ; python_version >= '3.6'
+pytest<5.0 ; python_version < '3.6'
+pytest-cov==3.0.0 ; python_version >= '3.6'
+pytest-cov<3.0.0 ; python_version < '3.6'
+hypothesis==3.1.0 ; python_version < '3.8'
 hypothesis==5.5.4 ; python_version == '3.8'
+hypothesis==5.35.4 ; python_version == '3.9'

requirements.txt

@@ -1,5 +1,5 @@
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [metadata]
 license_file = LICENSE.txt

setup.cfg

@@ -1,24 +1,13 @@
 #!/usr/bin/env python
 
 import io
-import sys
-import warnings
 
 from setuptools import setup, find_packages
 
 
-if sys.version_info[:2] <= (2, 6) or ((3, 0) <= sys.version_info[:2] <= (3, 3)):
-    python_ver = '.'.join(str(x) for x in sys.version_info[:3])
-
-    warnings.warn(
-        'You are using Python {0}, which will no longer be supported in '
-        'version 0.11.0'.format(python_ver),
-        DeprecationWarning)
-
-
 setup(
     name='jmespath',
-    version='0.10.0',
+    version='1.0.0',
     description='JSON Matching Expressions',
     long_description=io.open('README.rst', encoding='utf-8').read(),
     author='James Saryerwinnie',
@@ -27,22 +16,17 @@
     scripts=['bin/jp.py'],
     packages=find_packages(exclude=['tests']),
     license='MIT',
-    python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*',
+    python_requires='>=3.7',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: MIT License',
         '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',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],

setup.py

@@ -3,7 +3,7 @@
 from tests import OrderedDict
 from tests import json
 
-from nose.tools import assert_equal
+import pytest
 
 from jmespath.visitor import Options
 
@@ -15,19 +15,19 @@
 OPTIONS = Options(dict_cls=OrderedDict)
 
 
-def test_compliance():
+def _compliance_tests(requested_test_type):
     for full_path in _walk_files():
         if full_path.endswith('.json'):
             for given, test_type, test_data in load_cases(full_path):
                 t = test_data
                 # Benchmark tests aren't run as part of the normal
                 # test suite, so we only care about 'result' and
                 # 'error' test_types.
-                if test_type == 'result':
-                    yield (_test_expression, given, t['expression'],
+                if test_type == 'result' and test_type == requested_test_type:
+                    yield (given, t['expression'],
                            t['result'], os.path.basename(full_path))
-                elif test_type == 'error':
-                    yield (_test_error_expression, given, t['expression'],
+                elif test_type == 'error' and test_type == requested_test_type:
+                    yield (given, t['expression'],
                            t['error'], os.path.basename(full_path))
 
 
@@ -63,7 +63,11 @@ def load_cases(full_path):
             yield (given, test_type, case)
 
 
-def _test_expression(given, expression, expected, filename):
+@pytest.mark.parametrize(
+    'given, expression, expected, filename',
+    _compliance_tests('result')
+)
+def test_expression(given, expression, expected, filename):
     import jmespath.parser
     try:
         parsed = jmespath.compile(expression)
@@ -80,10 +84,14 @@ def _test_expression(given, expression, expected, filename):
                      actual_repr, pformat(parsed.parsed),
                      json.dumps(given, indent=4)))
     error_msg = error_msg.replace(r'\n', '\n')
-    assert_equal(actual, expected, error_msg)
+    assert actual == expected, error_msg
 
 
-def _test_error_expression(given, expression, error, filename):
+@pytest.mark.parametrize(
+    'given, expression, error, filename',
+    _compliance_tests('error')
+)
+def test_error_expression(given, expression, error, filename):
     import jmespath.parser
     if error not in ('syntax', 'invalid-type',
                      'unknown-function', 'invalid-arity', 'invalid-value'):

tests/test_compliance.py

@@ -152,7 +152,7 @@ def test_bad_first_character(self):
             tokens = list(self.lexer.tokenize('^foo[0]'))
 
     def test_unknown_character_with_identifier(self):
-        with self.assertRaisesRegexp(LexerError, "Unknown token"):
+        with self.assertRaisesRegex(LexerError, "Unknown token"):
             list(self.lexer.tokenize('foo-bar'))
 
 

tests/test_lexer.py

@@ -169,7 +169,7 @@ def test_bad_unicode_string(self):
         error_message = re.compile(
             r'Bad jmespath expression: '
             r'Invalid \\uXXXX escape.*\\uAZ12', re.DOTALL)
-        with self.assertRaisesRegexp(exceptions.LexerError, error_message):
+        with self.assertRaisesRegex(exceptions.LexerError, error_message):
             self.parser.parse(r'"\uAZ12"')