switch to tomli to support toml 1.0, drop py 3.5 and 3.6 support

Author: mr-mixas

.github/workflows/tests.yml

@@ -7,12 +7,9 @@ jobs:
       matrix:
         os: ['ubuntu-20.04']
         python-version:
-        - 3.5
-        - 3.6
         - 3.7
         - 3.8
         - 3.9
-        - pypy-3.6
         - pypy-3.7
         - pypy-3.8
         - pypy-3.9

nested_diff/cli.py

@@ -440,8 +440,8 @@ def __init__(self):
         """Initialize dumper."""
         super().__init__()
 
-        import toml
-        self.codec = toml
+        import tomli_w
+        self.codec = tomli_w
 
     def encode(self, data):
         """Encode data as TOML string."""
@@ -455,8 +455,12 @@ def __init__(self):
         """Initialize loader."""
         super().__init__()
 
-        import toml
-        self.codec = toml
+        if sys.version_info >= (3, 11):
+            import tomllib  # pragma nocover
+        else:
+            import tomli as tomllib  # pragma nocover
+
+        self.codec = tomllib
 
     def decode(self, data):
         """Parse TOML string."""

setup.py

@@ -22,8 +22,6 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        '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',
@@ -49,7 +47,8 @@
     extras_require={
         'cli': [
             'pyyaml',
-            'toml',
+            'tomli >= 1.1.0 ; python_version < "3.11"',
+            'tomli-w >= 1.0.0'
         ],
     },
     include_package_data=True,

tests/cli/shared.dict.a.toml

@@ -1,2 +1,4 @@
 [one.two]
-three = 4
+three = [
+    { four = "five" },
+]

tests/cli/shared.dict.b.toml

@@ -1,2 +1,4 @@
 [one.two]
-three = "four"
+three = [
+    { four = 5 },
+]

tests/cli/shared.dict.patch.toml

@@ -1,3 +1,4 @@
 [D.one.D.two.D.three]
-N = "four"
-O = 4
+D = [
+    { D = { four = { N = 5, O = "five" } } },
+]

tests/cli/test_diff_tool.test_toml_fmt.exp

@@ -1,3 +1,4 @@
 [D.one.D.two.D.three]
-N = "four"
-O = 4
+D = [
+    { D = { four = { N = 5, O = "five" } } },
+]

tox.ini

@@ -9,7 +9,8 @@ commands =
 deps =
     pytest
     pyyaml
-    toml
+    tomli >= 1.1.0 ; python_version < '3.11'
+    tomli-w >= 1.0.0
 
 setenv =
     PYTHONHASHSEED = 1