Merge branch 'master' into feature/refactor

Author: moomoohk

.github/workflows/tests.yml

@@ -32,10 +32,11 @@ jobs:
       - name: Generate Hashseed
         id: generate
         run: |
-          python -c "from random import randint;
+          python -c "import os
+          from random import randint
           hashseed = randint(0, 4294967295)
           print(f'{hashseed=}')
-          print(f'::set-output name=hashseed::{hashseed}')"
+          open(os.environ['GITHUB_OUTPUT'], 'a').write(f'hashseed={hashseed}')"
 
   # Tests job
   tests:
@@ -47,13 +48,13 @@ jobs:
     strategy:
       matrix:
         # Match versions specified in tox.ini
-        python-version: [3.6, 3.8, 3.9, pypy-3.7]
+        python-version: ['3.8', '3.9', '3.10', 'pypy-3.7']
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@main
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@main

README.rst

@@ -2,6 +2,7 @@ dpath-python
 ============
 
 |PyPI|
+|Python Version|
 |Build Status|
 |Gitter|
 
@@ -450,12 +451,16 @@ components instead of string globs.
     :target: https://pypi.python.org/pypi/dpath/
     :alt: PyPI: Latest Version
 
+.. |Python Version| image:: https://img.shields.io/pypi/pyversions/dpath?style=flat
+    :target: https://pypi.python.org/pypi/dpath/
+    :alt: Supported Python Version
+
 .. |Build Status| image:: https://github.com/dpath-maintainers/dpath-python/actions/workflows/tests.yml/badge.svg
-   :target: https://github.com/dpath-maintainers/dpath-python/actions/workflows/tests.yml
+    :target: https://github.com/dpath-maintainers/dpath-python/actions/workflows/tests.yml
 
 .. |Gitter| image:: https://badges.gitter.im/dpath-python/chat.svg
-   :target: https://gitter.im/dpath-python/chat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
-   :alt: Gitter
+    :target: https://gitter.im/dpath-python/chat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
+    :alt: Gitter
 
 Contributors
 ============

dpath/util.py

@@ -7,7 +7,7 @@
 
 
 def deprecated(func):
-    message =\
+    message = \
         "The dpath.util package is being deprecated. All util functions have been moved to dpath package top level."
 
     def wrapper(*args, **kwargs):

dpath/version.py

@@ -1 +1 @@
-VERSION = "2.0.6"
+VERSION = "2.0.8"

setup.py

@@ -13,7 +13,7 @@
 if __name__ == "__main__":
     setup(
         name="dpath",
-        url="https://www.github.com/akesterson/dpath-python",
+        url="https://github.com/dpath-maintainers/dpath-python",
         version=dpath.version.VERSION,
         description="Filesystem-like pathing and searching for dictionaries",
         long_description=long_description,
@@ -34,7 +34,7 @@
         #   (Source: https://github.com/hugovk/pypi-tools/blob/master/README.md)
         #
         # Conclusion: In order to accommodate type hinting support must be limited to Python versions >=3.6.
-        python_requires=">=3.6",
+        python_requires=">=3.7",
         classifiers=[
             'Development Status :: 5 - Production/Stable',
             'Environment :: Console',

tests/test_broken_afilter.py

@@ -26,14 +26,14 @@ def afilter(x):
     ]
 
     for (path, value) in dpath.util.search(dict, '/**', yielded=True, afilter=afilter):
-        assert(path in paths)
-    assert("view_failure" not in dpath.util.search(dict, '/**', afilter=afilter)['a'])
-    assert("d" not in dpath.util.search(dict, '/**', afilter=afilter)['a']['b']['c'])
+        assert path in paths
+    assert "view_failure" not in dpath.util.search(dict, '/**', afilter=afilter)['a']
+    assert "d" not in dpath.util.search(dict, '/**', afilter=afilter)['a']['b']['c']
 
     for (path, value) in dpath.util.search(dict, ['**'], yielded=True, afilter=afilter):
-        assert(path in paths)
-    assert("view_failure" not in dpath.util.search(dict, ['**'], afilter=afilter)['a'])
-    assert("d" not in dpath.util.search(dict, ['**'], afilter=afilter)['a']['b']['c'])
+        assert path in paths
+    assert "view_failure" not in dpath.util.search(dict, ['**'], afilter=afilter)['a']
+    assert "d" not in dpath.util.search(dict, ['**'], afilter=afilter)['a']['b']['c']
 
     def filter(x):
         sys.stderr.write(str(x))
@@ -54,5 +54,5 @@ def filter(x):
 
     results = [[x[0], x[1]] for x in dpath.util.search(a, 'actions/*', yielded=True)]
     results = [[x[0], x[1]] for x in dpath.util.search(a, 'actions/*', afilter=filter, yielded=True)]
-    assert(len(results) == 1)
-    assert(results[0][1]['type'] == 'correct')
+    assert len(results) == 1
+    assert results[0][1]['type'] == 'correct'

tests/test_path_get.py

@@ -15,6 +15,6 @@ def test_path_get_list_of_dicts():
     segments = ['a', 'b', 0, 0]
 
     res = dpath.segments.view(tdict, segments)
-    assert(isinstance(res['a']['b'], list))
-    assert(len(res['a']['b']) == 1)
-    assert(res['a']['b'][0][0] == 0)
+    assert isinstance(res['a']['b'], list)
+    assert len(res['a']['b']) == 1
+    assert res['a']['b'][0][0] == 0

tests/test_path_paths.py

@@ -1,10 +1,10 @@
-from nose.tools import raises
+from nose2.tools.such import helper
+
 import dpath.segments
 import dpath.exceptions
 import dpath.options
 
 
-@raises(dpath.exceptions.InvalidKeyName)
 def test_path_paths_empty_key_disallowed():
     tdict = {
         "Empty": {
@@ -14,8 +14,9 @@ def test_path_paths_empty_key_disallowed():
         }
     }
 
-    for x in dpath.segments.walk(tdict):
-        pass
+    with helper.assertRaises(dpath.exceptions.InvalidKeyName):
+        for x in dpath.segments.walk(tdict):
+            pass
 
 
 def test_path_paths_empty_key_allowed():
@@ -34,4 +35,4 @@ def test_path_paths_empty_key_allowed():
         pass
 
     dpath.options.ALLOW_EMPTY_STRING_KEYS = False
-    assert("/".join(segments) == "Empty//Key")
+    assert "/".join(segments) == "Empty//Key"