Skip to content

Commit 8581087

Browse files
committed
update for Cython3 and drop cp37+cp38 to enable cp313
1 parent d00b6bb commit 8581087

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{matrix.platform}}
1212
strategy:
1313
matrix:
14-
platform: [ubuntu-latest, macos-latest, windows-latest, macos-14]
14+
platform: [ubuntu-latest, macos-latest, windows-latest, macos-13]
1515
steps:
1616
- uses: actions/checkout@v3
1717
- name: Build wheels

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
requires = [
33
"setuptools",
44
"wheel",
5-
"Cython<3.0",
5+
"Cython>=3.0",
66
"numpy; python_version<'3.12'",
77
"numpy>=1.26.0b1; python_version>='3.12'"]
88
build-backend = "setuptools.build_meta"
99

1010
[project]
1111
name = "python-fcl"
1212
description = "Python bindings for the Flexible Collision Library"
13-
requires-python = ">=3.7"
13+
requires-python = ">=3.9"
1414
authors = [
1515
{name = "Jelle Feringa", email = "jelleferinga@gmail.com"},
1616
{name = "Matthew Matl", email = "mmatl@eecs.berkeley.edu"},
@@ -108,8 +108,7 @@ archs = ["x86_64"]
108108
[tool.cibuildwheel.macos]
109109
before-all = "bash build_dependencies/install_macos.sh"
110110
environment = { CPATH = "$(brew --prefix)/include:$(brew --prefix)/include/eigen3", LD_LIBRARY_PATH = "$(brew --prefix)/lib" }
111-
repair-wheel-command = "MACOSX_DEPLOYMENT_TARGET=14 delocate-wheel -w {dest_dir} -v {wheel}"
112-
111+
repair-wheel-command = "MACOSX_DEPLOYMENT_TARGET=13 delocate-wheel -w {dest_dir} -v {wheel}"
113112

114113
[tool.cibuildwheel.windows]
115114
before-all = "powershell build_dependencies\\install_windows.ps1"

src/fcl/fcl.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,10 +761,10 @@ cdef class DistanceFunction:
761761
(&dist)[0] = <double?> py_r[1]
762762
return <bool?> py_r[0]
763763

764-
cdef inline bool CollisionCallBack(defs.CollisionObjectd*o1, defs.CollisionObjectd*o2, void*cdata):
764+
cdef inline bool CollisionCallBack(defs.CollisionObjectd*o1, defs.CollisionObjectd*o2, void*cdata) noexcept:
765765
return (<CollisionFunction> cdata).eval_func(o1, o2)
766766

767-
cdef inline bool DistanceCallBack(defs.CollisionObjectd*o1, defs.CollisionObjectd*o2, void*cdata, double& dist):
767+
cdef inline bool DistanceCallBack(defs.CollisionObjectd*o1, defs.CollisionObjectd*o2, void*cdata, double& dist) noexcept:
768768
return (<DistanceFunction> cdata).eval_func(o1, o2, dist)
769769

770770

0 commit comments

Comments
 (0)