re-cythonize with a constrained cython version

Constrained the Cython version to be less than 3.0, but greater than 0.29.34. Updated the setup.py to account for the updated cythonize parameters. Stopped calling fix_version.py in appveyor builds.
ParallelSSH · Nov 13, 2023 · 803133a · 803133a
1 parent 1626d7e
commit 803133a
Show file tree

Hide file tree

Showing 16 changed files with 1,535 additions and 878 deletions.
diff --git a/ci/build-manylinux.sh b/ci/build-manylinux.sh
@@ -19,7 +19,7 @@ docker_tag="parallelssh/ssh2-manylinux"
 docker_files=("ci/docker/manylinux/Dockerfile" "ci/docker/manylinux/Dockerfile.2014_x86_64")
 
 rm -rf build ssh2/libssh2.* ssh2/*.so
-python ci/appveyor/fix_version.py .
+# python ci/appveyor/fix_version.py .
 
 if [[ $(uname -m) == "aarch64" ]]; then
     docker_tag="${docker_tag}:aarch64"

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,4 +1,4 @@
-cython
+cython>=0.29.34,<3.0.0
 flake8
 jinja2
 sphinx

diff --git a/setup.py b/setup.py
@@ -45,15 +45,15 @@
 _fwd_default = 0
 _comp_args = ["-O2"] if not ON_WINDOWS else None
 
-cython_directives = {'embedsignature': True,
+compiler_directives = {'embedsignature': True,
                      'boundscheck': False,
                      'optimize.use_switch': True,
                      'wraparound': False,
                      'language_level': 2,
 }
 cython_args = {
-    'cython_directives': cython_directives,
-    'cython_compile_time_env': {},
+    'compiler_directives': compiler_directives,
+    'compile_time_env': {},
 }
 
 if USING_CYTHON:

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