-
Notifications
You must be signed in to change notification settings - Fork 73
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Project updates for python 3.12 compatibility #194
Changes from 2 commits
75176e3
1626d7e
440a255
07b124b
abbbf86
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 >> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See ParallelSSH/ssh-python@97cfd5c iirc this is now automated and doesn't have to happen explicitly There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That is what I was thinking, so can remove it in follow-up commits. |
||
- 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? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
main: | ||
jobs: | ||
- python_test: | ||
matrix: | ||
parameters: | ||
python_ver: | ||
- "3.6" | ||
- "3.8" | ||
- "3.9" | ||
- "3.10" | ||
- "3.11" | ||
- "3.12" | ||
filters: | ||
tags: | ||
ignore: /.*/ | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ | |
try: | ||
from Cython.Distutils.extension import Extension | ||
from Cython.Distutils import build_ext | ||
from Cython.Build import cythonize | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. cythonize should not be used here. Need to commit pre-built cython sources (the .c files) directly or the source files will get re-generated on each build which may not work depending on the system doing the building. |
||
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, | ||
) |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cimg/...
instead ofcircleci/...
should fix the 3.10+ build failures