Merge pull request #136 from eandersson/3.13

Added Python 3.13 support

.github/workflows/testing.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.11.9, 3.12.6]
+        python-version: [3.11.9, 3.12.6, 3.13.0]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

CHANGELOG.rst

@@ -3,6 +3,7 @@ Changelog
 
 Version 2.11.0
 --------------
+- Added Python 3.13 support.
 - Replaced select.select with select.poll on Linux by default.
 - Replaced list with collections.deque - Thanks Bernhard Thiel.
 - Removed unnecessary lock when building messages.

README.rst

@@ -17,6 +17,7 @@ Changelog
 
 Version 2.11.0
 --------------
+- Added Python 3.13 support.
 - Replaced select.select with select.poll on Linux by default.
 - Replaced list with collections.deque - Thanks Bernhard Thiel.
 - Removed unnecessary lock when building messages.

amqpstorm/io.py

@@ -267,13 +267,14 @@ def _ssl_wrap_socket(self, sock):
             )
         hostname = self._parameters['hostname']
         context = ssl.SSLContext(ssl.PROTOCOL_TLS)
+        context.check_hostname = self._parameters['ssl_options'].get(
+            'check_hostname', False
+        )
         mode = self._parameters['ssl_options'].get('verify_mode', 'none')
         if mode.lower() == 'required':
             context.verify_mode = ssl.CERT_REQUIRED
         else:
             context.verify_mode = ssl.CERT_NONE
-        check = self._parameters['ssl_options'].get('check_hostname', False)
-        context.check_hostname = check
         context.load_default_certs()
         return context.wrap_socket(sock, do_handshake_on_connect=True,
                                    server_hostname=hostname)

docker/files/openssl.cnf

@@ -40,16 +40,17 @@ x509_extensions = root_ca_extensions
 commonName = hostname
 
 [ root_ca_extensions ]
-basicConstraints = CA:true
+basicConstraints = critical, CA:TRUE
 keyUsage = keyCertSign, cRLSign
 
 [ client_ca_extensions ]
-basicConstraints = CA:false
-keyUsage = digitalSignature,keyEncipherment
+basicConstraints=critical, CA:TRUE
+keyUsage = critical, cRLSign, digitalSignature, keyCertSign
 extendedKeyUsage = 1.3.6.1.5.5.7.3.2
 
 [ server_ca_extensions ]
-basicConstraints = CA:false
-keyUsage = digitalSignature,keyEncipherment
+basicConstraints=critical, CA:TRUE
+keyUsage = critical, cRLSign, digitalSignature, keyCertSign
 extendedKeyUsage = 1.3.6.1.5.5.7.3.1
 subjectAltName = DNS:rmq.eandersson.net
+

setup.py

@@ -54,6 +54,7 @@ def get_version(rel_path):
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Communications',