Fix #17 Add Python 3.7 Testing (#18)

* Fix #17 Add Python 3.7 Testing

This adds Python 3.7 testing.

Signed-off-by: David Brown <dmlb2000@gmail.com>

* Fix #17 Add Python 3.7 Testing

This adds Python 3.7 testing.

Signed-off-by: David Brown <dmlb2000@gmail.com>

* Fix Pylint 2.x Issues

Signed-off-by: David Brown <dmlb2000@gmail.com>

Author: dmlb2000

.travis.yml

@@ -1,26 +1,32 @@
+dist: xenial
 language: python
-python: 3.6
 stages:
 - lint
 - test
 - deploy
 
+".test_script": &1
+- coverage run --include='jsonpath2/*' --omit='jsonpath2/parser/JSONPath*' -m pytest -v
+- coverage report -m --fail-under 100
+- pip install .
+- python setup.py bdist_wheel
+- python setup.py sdist
+
 install: pip install -r requirements-dev.txt
 jobs:
   include:
   - stage: lint
     python: 3.6
     script: pre-commit run -a
+  - python: 3.7
+    script: pre-commit run -a
   - stage: test
     python: 3.6
-    script:
-    - coverage run --include='jsonpath2/*' --omit='jsonpath2/parser/JSONPath*' -m pytest -v
-    - coverage report -m --fail-under 100
-    - pip install .
-    - python setup.py bdist_wheel
-    - python setup.py sdist
+    script: *1
+  - python: 3.7
+    script: *1
   - stage: deploy
-    python: 3.6
+    python: 3.7
     script: skip
     deploy:
       skip_cleanup: true

jsonpath2/expressions/operator.py

@@ -12,11 +12,9 @@ class OperatorExpression(Expression):
 
     def __jsonpath__(self) -> Generator[str, None, None]:  # pragma: no cover abstract method
         """Abstract method to return the jsonpath."""
-        pass
 
     def evaluate(self, root_value: object, current_value: object) -> bool:  # pragma: no cover abstract method
         """Abstract method to evaluate the expression."""
-        pass
 
 
 class BinaryOperatorExpression(OperatorExpression):

jsonpath2/node.py

@@ -7,7 +7,7 @@
 
 
 # pylint: disable=too-few-public-methods
-class MatchData(object):
+class MatchData:
     """Match data object for storing node values."""
 
     def __init__(self, node, root_value, current_value):

jsonpath2/path.py

@@ -7,7 +7,7 @@
 import jsonpath2.parser as _parser
 
 
-class Path(object):
+class Path:
     """Path parsetree object."""
 
     def __init__(self, root_node: RootNode):

jsonpath2/subscript.py

@@ -10,11 +10,9 @@ class Subscript(Node):
 
     def __jsonpath__(self) -> Generator[str, None, None]:  # pragma: no cover abstract method
         """Abstract method to return the jsonpath."""
-        pass
 
     def match(
             self,
             root_value: object,
             current_value: object) -> Generator[MatchData, None, None]:  # pragma: no cover abstract method.
         """Abstract method to determine a node match."""
-        pass

jsonpath2/subscripts/arrayindex.py

@@ -27,7 +27,7 @@ def match(self, root_value: object, current_value: object) -> Generator[MatchDat
             if self.index < 0:
                 new_index = self.index + len(current_value)
 
-                if (new_index >= 0) and (new_index < len(current_value)):
+                if 0 <= new_index < len(current_value):
                     return [MatchData(SubscriptNode(TerminalNode(), [self]), root_value, current_value[new_index])]
             elif self.index < len(current_value):
                 return [MatchData(SubscriptNode(TerminalNode(), [self]), root_value, current_value[self.index])]

jsonpath2/subscripts/wildcard.py

@@ -23,7 +23,7 @@ def match(self, root_value: object, current_value: object) -> Generator[MatchDat
                 lambda index: ObjectIndexSubscript(
                     index).match(root_value, current_value),
                 current_value.keys()))
-        elif isinstance(current_value, list):
+        if isinstance(current_value, list):
             return itertools.chain(*map(
                 lambda index: ArrayIndexSubscript(
                     index).match(root_value, current_value),

requirements-dev.txt

@@ -2,7 +2,7 @@ antlr4-python3-runtime
 coverage
 pep257
 pre-commit
-pylint<2.0
+pylint
 pytest
 setuptools
 six