diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bd77b461..ed732f7e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: 3.9 + python-version: '3.10.5' cache: 'pip' - run: pip install --upgrade flake8 - name: flake8 @@ -33,7 +33,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: 3.9 + python-version: '3.10.5' cache: 'pip' - run: python -m pip install isort - name: isort @@ -53,7 +53,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: 3.9 + python-version: '3.10.5' cache: 'pip' - run: pip install --upgrade mypy types-requests types-urllib3 - name: mypy diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 3d3d0dc5..86d46b75 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.8, 3.9, pypy-3.9, pypy-3.8, pypy-3.9, 3.10.4, '3.11.0-beta.3' ] + python-version: [3.7, 3.8, 3.9, pypy-3.9, pypy-3.8, pypy-3.9, '3.10.5', '3.11.0-beta.4' ] os: [ ubuntu-20.04, windows-2022, diff --git a/tests/test_dict2xml.py b/tests/test_dict2xml.py index 6aee83e0..c3b4fed3 100644 --- a/tests/test_dict2xml.py +++ b/tests/test_dict2xml.py @@ -1,4 +1,5 @@ import unittest + from json2xml import dicttoxml diff --git a/tests/test_json2xml.py b/tests/test_json2xml.py index c1045fbb..beaab636 100644 --- a/tests/test_json2xml.py +++ b/tests/test_json2xml.py @@ -3,17 +3,18 @@ """Tests for `json2xml` package.""" +import json import unittest from collections import OrderedDict -from pyexpat import ExpatError import pytest import xmltodict -import json +from pyexpat import ExpatError from json2xml import json2xml -from json2xml.utils import InvalidDataError, readfromjson, readfromstring, readfromurl, \ - JSONReadError, StringReadError, URLReadError +from json2xml.utils import (InvalidDataError, JSONReadError, StringReadError, + URLReadError, readfromjson, readfromstring, + readfromurl) class TestJson2xml(unittest.TestCase): @@ -88,7 +89,7 @@ def test_no_wrapper(self): ) xmldata = json2xml.Json2xml(data, root=False, pretty=False).to_xml() assert xmldata.startswith(b'mojombo') - self.assertRaises(ExpatError, xmltodict.parse, xmldata) + pytest.raises(ExpatError, xmltodict.parse, xmldata) def test_item_wrap(self): data = readfromstring(