Skip to content

Commit 653909f

Browse files
committed
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.
1 parent 75176e3 commit 653909f

File tree

16 files changed

+100
-52
lines changed

16 files changed

+100
-52
lines changed

.circleci/config.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
version: 2.1
1717

1818
orbs:
19-
python: circleci/python@0.3.2
19+
python: circleci/python@2.0.3
2020

2121
jobs:
2222
python_test:
2323
parameters:
2424
python_ver:
2525
type: string
26-
default: "3.6"
26+
default: "3.11"
2727
docker:
2828
- image: circleci/python:<< parameters.python_ver >>
2929
steps:
3030
- checkout
31-
- python/load-cache:
32-
dependency-file: requirements_dev.txt
33-
key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
31+
# - python/load-cache: # This command is unavailable in the orb
32+
# dependency-file: requirements_dev.txt
33+
# key: depsv3-{{ .Branch }}.{{ arch }}-PY<< parameters.python_ver >>
3434
- run:
3535
name: Deps
3636
command: |
@@ -139,17 +139,17 @@ jobs:
139139
steps: *manylinux-steps
140140

141141
workflows:
142-
version: 2.1
142+
# version: 2.1 - default?
143143
main:
144144
jobs:
145145
- python_test:
146146
matrix:
147147
parameters:
148148
python_ver:
149-
- "3.6"
150149
- "3.8"
151-
- "3.9"
152150
- "3.10"
151+
- "3.11"
152+
- "3.12"
153153
filters:
154154
tags:
155155
ignore: /.*/

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
try:
1414
from Cython.Distutils.extension import Extension
1515
from Cython.Distutils import build_ext
16+
from Cython.Build import cythonize
1617
except ImportError:
1718
from setuptools import Extension
1819
USING_CYTHON = False
@@ -71,7 +72,6 @@
7172
library_dirs=[_lib_dir],
7273
runtime_library_dirs=runtime_library_dirs,
7374
extra_compile_args=_comp_args,
74-
**cython_args,
7575
)
7676
for i in range(len(sources))]
7777

@@ -131,6 +131,6 @@
131131
'Operating System :: Microsoft :: Windows',
132132
'Operating System :: MacOS :: MacOS X',
133133
],
134-
ext_modules=extensions,
134+
ext_modules=cythonize(extensions, **cython_args) if USING_CYTHON else extensions,
135135
package_data=package_data,
136136
)

ssh2/agent.c

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

ssh2/channel.c

Lines changed: 7 additions & 3 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: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ssh2/exceptions.c

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

ssh2/fileinfo.c

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

ssh2/knownhost.c

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

ssh2/listener.c

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

ssh2/pkey.c

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

0 commit comments

Comments
 (0)