Skip to content

Commit abe89a4

Browse files
JacobCallahanJacobCallahan
committed
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. Also made the appveyor version PEP440 compatible
1 parent 1626d7e commit abe89a4

File tree

16 files changed

+1536
-878
lines changed

16 files changed

+1536
-878
lines changed

‎ci/appveyor/fix_version.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import sys
66

77
def get_describe_tag():
8-
return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8')
8+
ver, change, *rem = subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8')
9+
return f"{ver}+{change}.{'.'.join(rem)}" # PEP440 compatible
910

1011
def make_version_file(basedir):
1112
rev = os.environ.get('APPVEYOR_REPO_COMMIT',

‎requirements_dev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cython
1+
cython>=0.29.34,<3.0.0
22
flake8
33
jinja2
44
sphinx

‎setup.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
_fwd_default = 0
4646
_comp_args = ["-O2"] if not ON_WINDOWS else None
4747

48-
cython_directives = {'embedsignature': True,
48+
compiler_directives = {'embedsignature': True,
4949
'boundscheck': False,
5050
'optimize.use_switch': True,
5151
'wraparound': False,
5252
'language_level': 2,
5353
}
5454
cython_args = {
55-
'cython_directives': cython_directives,
56-
'cython_compile_time_env': {},
55+
'compiler_directives': compiler_directives,
56+
'compile_time_env': {},
5757
}
5858

5959
if USING_CYTHON:

‎ssh2/agent.c‎

Lines changed: 131 additions & 73 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ssh2/channel.c‎

Lines changed: 130 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ssh2/error_codes.c‎

Lines changed: 66 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)