Skip to content

Commit

Permalink
Merge pull request #70 from Eric-Vin/master
Browse files Browse the repository at this point in the history
Bump CIBuildWheel Version to 2.15.0
  • Loading branch information
mikedh authored Aug 16, 2023
2 parents dc99953 + 43ebd59 commit c1e2cdb
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Build wheels
uses: pypa/cibuildwheel@v2.12.0
uses: pypa/cibuildwheel@v2.15.0
env:
CIBW_ARCHS_MACOS: 'x86_64 arm64'
- uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Build wheels
uses: pypa/cibuildwheel@v2.12.0
uses: pypa/cibuildwheel@v2.15.0
env:
CIBW_ARCHS_MACOS: 'x86_64 arm64'
- uses: actions/upload-artifact@v3
Expand Down
7 changes: 6 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
[build-system]
requires = ["setuptools", "wheel", "oldest-supported-numpy", "Cython"]
requires = [
"setuptools",
"wheel",
"Cython<3.0",
"oldest-supported-numpy; python_version<'3.12'",
"numpy>=1.26.0b1; python_version>='3.12'"]
build-backend = "setuptools.build_meta"

[tool.cibuildwheel]
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ setup_requires =
numpy
Cython
install_requires =
numpy
numpy; python_version<'3.12'
numpy>=1.26.0b1; python_version>='3.12'
Cython

[options.package_data]
Expand Down
2 changes: 1 addition & 1 deletion src/fcl/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.7.0.4"
__version__ = "0.7.0.5"
2 changes: 0 additions & 2 deletions tests/test_precision.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ def test_obj_obj_simple_distance(self):
assert ret == -1

def test_obj_obj_signed_distance(self):

request = fcl.DistanceRequest(
enable_nearest_points=True, enable_signed_distance=True
)
Expand Down Expand Up @@ -185,7 +184,6 @@ def test_mgr_obj_signed_distance(self):
)

def test_mgr_mgr_signed_distance(self):

req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True)
ddata = fcl.DistanceData(req)
self.mgr1.distance(self.mgr2, ddata, fcl.defaultDistanceCallback)
Expand Down

0 comments on commit c1e2cdb

Please sign in to comment.