Fix syntax error in Python 3.12 (#852)

* update hide_modules.py to work with Python 3.12 * add Python 3.11 and 3.12 to CI tests * adapt version test to allow Python dev version --------- Co-authored-by: mrbean-bremen <[email protected]>
pydicom · Jul 20, 2023 · 1511488 · 1511488
1 parent a5beba7
commit 1511488
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git 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
@@ -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/docs/changelog/v2.1.0.rst b/docs/changelog/v2.1.0.rst
@@ -19,3 +19,5 @@ Enhancements
 
 Changes
 .......
+
+* Add preliminary support for Python 3.12
diff --git a/pynetdicom/tests/hide_modules.py b/pynetdicom/tests/hide_modules.py
@@ -26,17 +26,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-try:
-    import importlib.abc
+from importlib.abc import MetaPathFinder
 
-    # py>=3.3 has MetaPathFinder
-    _ModuleHiderBase = getattr(importlib.abc, "MetaPathFinder", importlib.abc.Finder)
-except ImportError:
-    # py2
-    _ModuleHiderBase = object
 
-
-class ModuleHider(_ModuleHiderBase):
+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.

diff --git a/pynetdicom/tests/test_environment.py b/pynetdicom/tests/test_environment.py
@@ -40,6 +40,8 @@ def test_python_version(self):
         if not version:
             raise RuntimeError("No 'PYTHON_VERSION' envar has been set")
 
+        # remove any pre-release suffix
+        version = version.split("-")[0]
         version = tuple([int(vv) for vv in version.split(".")])
         assert version[:2] == sys.version_info[:2]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@ Enhancements

		Changes
		.......

		* Add preliminary support for Python 3.12