Update Github Actions and fixed Python 3.12 comp

- Change to Ubuntu latest again. - Update Python versions. - Disabled Python 2.7 test for now.
eandersson · Aug 26, 2023 · f5f8031 · f5f8031
1 parent 9c563cf
commit f5f8031
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,14 +8,14 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 2.7
+    - name: Set up Python 3.6
       uses: actions/setup-python@v2
       with:
-        python-version: 2.7
+        python-version: 3.6.15
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -9,10 +9,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7.18, 3.6.15, 3.8.16, 3.9.16, 3.10.10, 3.11.2]
+        python-version: [3.11.4, 3.12.0-rc.1]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}

diff --git a/amqpstorm/tests/functional/test_reliability.py b/amqpstorm/tests/functional/test_reliability.py
@@ -1,4 +1,4 @@
-import imp
+import importlib
 import sys
 import threading
 import time
@@ -182,7 +182,7 @@ def test_functional_ssl_connection_without_ssl(self):
         restore_func = sys.modules['ssl']
         try:
             sys.modules['ssl'] = None
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
             self.assertIsNone(compatibility.ssl)
             self.assertRaisesRegex(
                 AMQPConnectionError,
@@ -191,7 +191,7 @@ def test_functional_ssl_connection_without_ssl(self):
             )
         finally:
             sys.modules['ssl'] = restore_func
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
 
     @setup(new_connection=False, queue=True)
     def test_functional_verify_passive_declare(self):

diff --git a/amqpstorm/tests/unit/test_compatibility.py b/amqpstorm/tests/unit/test_compatibility.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import imp
+import importlib
 import ssl
 import sys
 
@@ -168,15 +168,15 @@ def test_compatibility_ssl_not_defined(self):
         restore_func = sys.modules['ssl']
         try:
             sys.modules['ssl'] = None
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
             self.assertIsNone(compatibility.ssl)
             self.assertIsNone(compatibility.DEFAULT_SSL_VERSION)
             self.assertFalse(compatibility.SSL_SUPPORTED)
             self.assertFalse(compatibility.SSL_CERT_MAP)
             self.assertFalse(compatibility.SSL_VERSIONS)
         finally:
             sys.modules['ssl'] = restore_func
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
 
     def test_compatibility_no_supported_ssl_version(self):
         """This tests mimics the behavior of a Python build without
@@ -189,7 +189,7 @@ def test_compatibility_no_supported_ssl_version(self):
             del sys.modules['ssl'].PROTOCOL_TLSv1_2
             del sys.modules['ssl'].PROTOCOL_TLSv1_1
             del sys.modules['ssl'].PROTOCOL_TLSv1
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
             self.assertIsNone(compatibility.DEFAULT_SSL_VERSION)
             self.assertFalse(compatibility.SSL_SUPPORTED)
             self.assertFalse(compatibility.SSL_CERT_MAP)
@@ -198,7 +198,7 @@ def test_compatibility_no_supported_ssl_version(self):
             sys.modules['ssl'].PROTOCOL_TLSv1_2 = restore_tls_v1_2
             sys.modules['ssl'].PROTOCOL_TLSv1_1 = restore_tls_v1_1
             sys.modules['ssl'].PROTOCOL_TLSv1 = restore_tls_v1
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
 
     def test_compatibility_only_tls_v1_supported(self):
         """This tests mimics the behavior of Python 2.7.8 or earlier that
@@ -209,10 +209,10 @@ def test_compatibility_only_tls_v1_supported(self):
         try:
             del sys.modules['ssl'].PROTOCOL_TLSv1_2
             del sys.modules['ssl'].PROTOCOL_TLSv1_1
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
             self.assertEqual(compatibility.get_default_ssl_version(),
                              ssl.PROTOCOL_TLSv1)
         finally:
             sys.modules['ssl'].PROTOCOL_TLSv1_2 = restore_tls_v1_2
             sys.modules['ssl'].PROTOCOL_TLSv1_1 = restore_tls_v1
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
diff --git a/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py b/amqpstorm/tests/unit/uri_connection/test_uri_connection_exception.py
@@ -1,4 +1,4 @@
-import imp
+import importlib
 import ssl
 import sys
 
@@ -63,7 +63,7 @@ def test_uri_ssl_not_supported(self):
         restore_func = sys.modules['ssl']
         try:
             sys.modules['ssl'] = None
-            imp.reload(compatibility)
+            importlib.reload(compatibility)
             self.assertIsNone(compatibility.ssl)
             self.assertRaisesRegex(
                 AMQPConnectionError,
@@ -72,4 +72,4 @@ def test_uri_ssl_not_supported(self):
             )
         finally:
             sys.modules['ssl'] = restore_func
-            imp.reload(compatibility)
+            importlib.reload(compatibility)