modify the CI files

Author: seamile

.github/workflows/python-package.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
@@ -34,8 +34,8 @@ jobs:
 
       - name: Lint with flake8
         run: |
-          flake8 jsonfmt.py --count --select=E9,F63,F7,F82 --show-source --statistics
-          flake8 jsonfmt.py --count --exit-zero --max-complexity=10 --max-line-length=90 --statistics
+          flake8 jsonfmt/*.py --count --select=E9,F63,F7,F82 --show-source --statistics
+          flake8 jsonfmt/*.py --count --exit-zero --max-complexity=15 --max-line-length=120 --statistics
 
       - name: Test with pytest
-        run: pytest test/test.py
+        run: pytest test/

.github/workflows/python-publish.yml

@@ -33,7 +33,7 @@ jobs:
           pip install -r requirements.txt
 
       - name: Test with pytest
-        run: pytest test/test.py
+        run: pytest test/
 
       - name: Build package
         run: python -m build

jsonfmt/jsonfmt.py

@@ -196,8 +196,7 @@ def get_output_fp(input_file: IO, cp2clip: bool, diff: bool,
         return TEMP_CLIPBOARD
     elif diff:
         name = f"_{os.path.basename(input_file.name)}"
-        return NamedTemporaryFile(mode='w+', prefix='jf-', suffix=name,
-                                  delete=False, delete_on_close=False)
+        return NamedTemporaryFile(mode='w+', prefix='jf-', suffix=name, delete=False)
     elif input_file is sys.stdin or overview:
         return sys.stdout
     elif overwrite:
@@ -361,11 +360,9 @@ def main():
         pyperclip.copy(TEMP_CLIPBOARD.read())
         utils.print_inf('result copied to clipboard')
     elif diff_mode:
-        if len(diff_files) < 2:
-            utils.exit_with_error('not enougth files to compare')
         try:
             compare(diff_files[0], diff_files[1], args.difftool)
-        except (OSError, ValueError) as err:
+        except (OSError, ValueError, IndexError) as err:
             utils.exit_with_error(err)
 
 

jsonfmt/xml2py.py

@@ -1,11 +1,17 @@
+import sys
 import xml.etree.ElementTree as ET
 from collections.abc import Mapping
 from copy import deepcopy
-from typing import Any, Optional, Self
 from xml.dom.minidom import parseString
 
 from .utils import safe_eval, sort_dict
 
+if sys.version_info < (3, 11):
+    from typing import Any, Dict, Optional, TypeVar, Union
+    Self = TypeVar('Self', bound='XmlElement')
+else:
+    from typing import Any, Dict, Optional, Self, Union
+
 
 class _list(list):
     pass
@@ -29,7 +35,7 @@ def makeelement(cls, tag, attrib, text=None, tail=None) -> Self:
         return cls(tag, attrib, text, tail)
 
     @classmethod
-    def clone(cls, src: Self | ET.Element, dst: Optional[Self] = None) -> Self:
+    def clone(cls, src: Union[Self, ET.Element], dst: Optional[Self] = None) -> Self:
         if dst is None:
             dst = cls(src.tag, src.attrib, src.text, src.tail)
 
@@ -46,7 +52,7 @@ def from_xml(cls, xml: str) -> Self:
 
     def to_xml(self,
                minimal: Optional[bool] = None,
-               indent: Optional[int | str] = 2
+               indent: Optional[Union[int, str]] = 2
                ) -> str:
         ele = deepcopy(self)
         for e in ele.iter():
@@ -73,7 +79,7 @@ def spawn(self, tag: str, attrib={}, text=None, tail=None, **extra) -> Self:
         self.append(child)
         return child
 
-    def _get_attrs(self) -> Optional[dict[str, Any]]:
+    def _get_attrs(self) -> Optional[Dict[str, Any]]:
         attrs = {f'@{k}': safe_eval(v) for k, v in self.attrib.items()}
 
         if len(self) == 0:

test/test_jsonfmt.py

@@ -509,11 +509,6 @@ def test_main_diff_mode(self):
             jsonfmt.main()
         self.assertIn('less than two files', sys.stderr.read())
 
-        with patch.multiple(sys, argv=['jf', '-D', 'diff', XML_FILE, 'null']), \
-                self.assertRaises(SystemExit):
-            jsonfmt.main()
-        self.assertIn('not enougth files to compare', sys.stderr.read())
-
         with patch.multiple(sys, argv=['jf', '-D', 'nothing', XML_FILE, TOML_FILE]), \
                 self.assertRaises(SystemExit):
             jsonfmt.main()