Additional 3.12 compatibility changes

This included a number of changes related to the CPython API. I additionally bumped the supported python versions in CI.
ParallelSSH · Nov 10, 2023 · 1626d7e · 1626d7e
1 parent 75176e3
commit 1626d7e
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 61 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,30 +16,30 @@
 version: 2.1
 
 orbs:
-  python: circleci/python@0.3.2
+  python: circleci/python@2.0.3
 
 jobs:
   python_test:
     parameters:
       python_ver:
         type: string
-        default: "3.6"
+        default: "3.11"
     docker:
       - image: circleci/python:<< parameters.python_ver >>
     steps:
       - checkout
-      - python/load-cache:
-          dependency-file: requirements_dev.txt
-          key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
+      # - python/load-cache:  #  This command is unavailable in the orb
+      #     dependency-file: requirements_dev.txt
+      #     key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
       - run:
           name: Deps
           command: |
             sudo apt-get update
             sudo apt-get install cmake openssh-server
             pip install -r requirements_dev.txt
-      - python/save-cache:
-          dependency-file: requirements_dev.txt
-          key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
+      # - python/save-cache:  #  This command is unavailable in the orb
+      #     dependency-file: requirements_dev.txt
+      #     key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
       - run:
           command: |
             python setup.py build_ext --inplace
@@ -93,9 +93,9 @@ jobs:
       image: ubuntu-2004:202201-02
     steps: &manylinux-steps
       - checkout
-      - python/load-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements_dev.txt
+      # - python/load-cache:  #  This command is unavailable in the orb
+      #     key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
+      #     dependency-file: requirements_dev.txt
       - run:
           name: Git LFS
           command: |
@@ -112,9 +112,9 @@ jobs:
             which twine
             which python
             which python3
-      - python/save-cache:
-          key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
-          dependency-file: requirements_dev.txt
+      # - python/save-cache:  #  This command is unavailable in the orb
+      #     key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
+      #     dependency-file: requirements_dev.txt
       - run:
           name: Build Wheels
           command: |
@@ -139,17 +139,17 @@ jobs:
     steps: *manylinux-steps
 
 workflows:
-  version: 2.1
+  # version: 2.1 - default?
   main:
     jobs:
       - python_test:
           matrix:
             parameters:
               python_ver:
-                - "3.6"
                 - "3.8"
-                - "3.9"
                 - "3.10"
+                - "3.11"
+                - "3.12"
           filters:
             tags:
               ignore: /.*/

diff --git a/setup.py b/setup.py
@@ -13,6 +13,7 @@
 try:
     from Cython.Distutils.extension import Extension
     from Cython.Distutils import build_ext
+    from Cython.Build import cythonize
 except ImportError:
     from setuptools import Extension
     USING_CYTHON = False
@@ -71,7 +72,6 @@
               library_dirs=[_lib_dir],
               runtime_library_dirs=runtime_library_dirs,
               extra_compile_args=_comp_args,
-              **cython_args,
               )
     for i in range(len(sources))]
 
@@ -131,6 +131,6 @@
         'Operating System :: Microsoft :: Windows',
         'Operating System :: MacOS :: MacOS X',
     ],
-    ext_modules=extensions,
+    ext_modules=cythonize(extensions, **cython_args) if USING_CYTHON else extensions,
     package_data=package_data,
 )
diff --git a/ssh2/agent.c b/ssh2/agent.c
diff --git a/ssh2/channel.c b/ssh2/channel.c
diff --git a/ssh2/error_codes.c b/ssh2/error_codes.c
diff --git a/ssh2/exceptions.c b/ssh2/exceptions.c
diff --git a/ssh2/fileinfo.c b/ssh2/fileinfo.c
diff --git a/ssh2/knownhost.c b/ssh2/knownhost.c
diff --git a/ssh2/listener.c b/ssh2/listener.c
diff --git a/ssh2/pkey.c b/ssh2/pkey.c