diff --git a/.github/workflows/merge-pytest.yml b/.github/workflows/merge-pytest.yml index 93dd3c85e..1300ea1cb 100644 --- a/.github/workflows/merge-pytest.yml +++ b/.github/workflows/merge-pytest.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v3 @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev'] steps: - uses: actions/checkout@v3 @@ -67,7 +67,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev'] steps: - uses: actions/checkout@v3 @@ -98,7 +98,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev'] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pr-pytest.yml b/.github/workflows/pr-pytest.yml index adf7b1b20..6dd608be4 100644 --- a/.github/workflows/pr-pytest.yml +++ b/.github/workflows/pr-pytest.yml @@ -98,7 +98,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev'] steps: - uses: actions/checkout@v3 diff --git a/pynetdicom/tests/hide_modules.py b/pynetdicom/tests/hide_modules.py index 4f0c477fb..a77a453ec 100644 --- a/pynetdicom/tests/hide_modules.py +++ b/pynetdicom/tests/hide_modules.py @@ -26,13 +26,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -import importlib.abc +from importlib.abc import MetaPathFinder -# py>=3.3 has MetaPathFinder -_ModuleHiderBase = getattr(importlib.abc, "MetaPathFinder") - -class ModuleHider(MetaPathFinder):: +class ModuleHider(MetaPathFinder): """Import finder hook to hide specified modules ModuleHider(hidden_modules) -> instance hidden_modules is a list of strings naming modules to hide.