Skip to content

Commit

Permalink
re-cythonize with a constrained cython version
Browse files Browse the repository at this point in the history
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
  • Loading branch information
JacobCallahan committed Nov 13, 2023
1 parent 1626d7e commit fb82ad3
Show file tree
Hide file tree
Showing 17 changed files with 1,538 additions and 880 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
type: string
default: "3.11"
docker:
- image: circleci/python:<< parameters.python_ver >>
- image: cimg/python:<< parameters.python_ver >>
steps:
- checkout
# - python/load-cache: # This command is unavailable in the orb
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
steps: *manylinux-steps

workflows:
# version: 2.1 - default?
version: 2
main:
jobs:
- python_test:
Expand Down
3 changes: 2 additions & 1 deletion ci/appveyor/fix_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import sys

def get_describe_tag():
return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8')
ver, change, commit = subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8').split('-')
return f'{ver}+{change}.{commit}' # PEP440 compatible

def make_version_file(basedir):
rev = os.environ.get('APPVEYOR_REPO_COMMIT',
Expand Down
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython
cython>=0.29.34,<3.0.0
flake8
jinja2
sphinx
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
204 changes: 131 additions & 73 deletions ssh2/agent.c

Large diffs are not rendered by default.

201 changes: 130 additions & 71 deletions ssh2/channel.c

Large diffs are not rendered by default.

96 changes: 66 additions & 30 deletions ssh2/error_codes.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fb82ad3

Please sign in to comment.