From b41e4409ac9e0ab45f0040b77600a44d6fb82c36 Mon Sep 17 00:00:00 2001 From: Eric Vin <8935814+Eric-Vin@users.noreply.github.com> Date: Tue, 15 Aug 2023 11:18:30 -0700 Subject: [PATCH 01/10] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 75a0c54..a111c45 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -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 From 942657e86184a73ada439ef5b8279ec581655c82 Mon Sep 17 00:00:00 2001 From: Eric Vin <8935814+Eric-Vin@users.noreply.github.com> Date: Tue, 15 Aug 2023 11:20:00 -0700 Subject: [PATCH 02/10] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d486c39..f3d2bfe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 From e8720115c51646497f2eef5a9a80065d0d76d7d6 Mon Sep 17 00:00:00 2001 From: Eric Vin <8935814+Eric-Vin@users.noreply.github.com> Date: Tue, 15 Aug 2023 11:56:00 -0700 Subject: [PATCH 03/10] Bump Version from 0.7.0.4 -> 0.7.0.5 --- src/fcl/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fcl/version.py b/src/fcl/version.py index 52ef09c..c5f016e 100644 --- a/src/fcl/version.py +++ b/src/fcl/version.py @@ -1 +1 @@ -__version__ = "0.7.0.4" +__version__ = "0.7.0.5" From 9bdcfd9946e8ac84f2415cfe5dd5c71ba906515d Mon Sep 17 00:00:00 2001 From: Eric Vin Date: Tue, 15 Aug 2023 12:24:25 -0700 Subject: [PATCH 04/10] Ran black on tests. --- tests/test_fcl.py | 8 ++++++-- tests/test_precision.py | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/test_fcl.py b/tests/test_fcl.py index 11e5932..c94a939 100644 --- a/tests/test_fcl.py +++ b/tests/test_fcl.py @@ -479,7 +479,9 @@ def test_nearest_points(self): manager2.setup() manager2r.setup() - ddata = fcl.DistanceData(request=fcl.DistanceRequest(enable_nearest_points=True)) + ddata = fcl.DistanceData( + request=fcl.DistanceRequest(enable_nearest_points=True) + ) manager1.distance(manager2, ddata, fcl.defaultDistanceCallback) self.assertAlmostEqual( ddata.result.min_distance, @@ -487,7 +489,9 @@ def test_nearest_points(self): places=6, ) - ddata = fcl.DistanceData(request=fcl.DistanceRequest(enable_nearest_points=True)) + ddata = fcl.DistanceData( + request=fcl.DistanceRequest(enable_nearest_points=True) + ) manager1.distance(manager2r, ddata, fcl.defaultDistanceCallback) self.assertAlmostEqual( ddata.result.min_distance, diff --git a/tests/test_precision.py b/tests/test_precision.py index 7e2d546..60f647a 100644 --- a/tests/test_precision.py +++ b/tests/test_precision.py @@ -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 ) @@ -166,7 +165,9 @@ def test_mgr_mgr_coll(self): assert rdata.result.is_collision def test_mgr_obj_signed_distance(self): - req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True) + req = fcl.DistanceRequest( + enable_signed_distance=True, enable_nearest_points=True + ) ddata = fcl.DistanceData(req) self.mgr1.distance(self.o2, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) @@ -175,7 +176,9 @@ def test_mgr_obj_signed_distance(self): abs(ddata.result.min_distance), ) - req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True) + req = fcl.DistanceRequest( + enable_signed_distance=True, enable_nearest_points=True + ) ddata = fcl.DistanceData(req) self.mgr2.distance(self.o1, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) @@ -185,8 +188,9 @@ 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) + req = fcl.DistanceRequest( + enable_signed_distance=True, enable_nearest_points=True + ) ddata = fcl.DistanceData(req) self.mgr1.distance(self.mgr2, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) @@ -195,7 +199,9 @@ def test_mgr_mgr_signed_distance(self): abs(ddata.result.min_distance), ) - req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True) + req = fcl.DistanceRequest( + enable_signed_distance=True, enable_nearest_points=True + ) ddata = fcl.DistanceData(req) self.mgr2.distance(self.mgr1, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) From ba2c811980d5dcb9b5f6ec0d300a73c10b3a8dda Mon Sep 17 00:00:00 2001 From: Eric Vin Date: Tue, 15 Aug 2023 12:29:10 -0700 Subject: [PATCH 05/10] Added max Cython version. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 07a350c..0323d58 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "wheel", "oldest-supported-numpy", "Cython"] +requires = ["setuptools", "wheel", "oldest-supported-numpy", "Cython<3.0"] build-backend = "setuptools.build_meta" [tool.cibuildwheel] From 5dd75b4ce852fc8df0e7d1bc1485234a31b91391 Mon Sep 17 00:00:00 2001 From: Eric Vin Date: Tue, 15 Aug 2023 12:47:49 -0700 Subject: [PATCH 06/10] Rerun black with '-l 90' --- tests/test_fcl.py | 8 ++------ tests/test_precision.py | 16 ++++------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tests/test_fcl.py b/tests/test_fcl.py index c94a939..11e5932 100644 --- a/tests/test_fcl.py +++ b/tests/test_fcl.py @@ -479,9 +479,7 @@ def test_nearest_points(self): manager2.setup() manager2r.setup() - ddata = fcl.DistanceData( - request=fcl.DistanceRequest(enable_nearest_points=True) - ) + ddata = fcl.DistanceData(request=fcl.DistanceRequest(enable_nearest_points=True)) manager1.distance(manager2, ddata, fcl.defaultDistanceCallback) self.assertAlmostEqual( ddata.result.min_distance, @@ -489,9 +487,7 @@ def test_nearest_points(self): places=6, ) - ddata = fcl.DistanceData( - request=fcl.DistanceRequest(enable_nearest_points=True) - ) + ddata = fcl.DistanceData(request=fcl.DistanceRequest(enable_nearest_points=True)) manager1.distance(manager2r, ddata, fcl.defaultDistanceCallback) self.assertAlmostEqual( ddata.result.min_distance, diff --git a/tests/test_precision.py b/tests/test_precision.py index 60f647a..a695cb2 100644 --- a/tests/test_precision.py +++ b/tests/test_precision.py @@ -165,9 +165,7 @@ def test_mgr_mgr_coll(self): assert rdata.result.is_collision def test_mgr_obj_signed_distance(self): - req = fcl.DistanceRequest( - enable_signed_distance=True, enable_nearest_points=True - ) + req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True) ddata = fcl.DistanceData(req) self.mgr1.distance(self.o2, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) @@ -176,9 +174,7 @@ def test_mgr_obj_signed_distance(self): abs(ddata.result.min_distance), ) - req = fcl.DistanceRequest( - enable_signed_distance=True, enable_nearest_points=True - ) + req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True) ddata = fcl.DistanceData(req) self.mgr2.distance(self.o1, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) @@ -188,9 +184,7 @@ 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 - ) + req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True) ddata = fcl.DistanceData(req) self.mgr1.distance(self.mgr2, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) @@ -199,9 +193,7 @@ def test_mgr_mgr_signed_distance(self): abs(ddata.result.min_distance), ) - req = fcl.DistanceRequest( - enable_signed_distance=True, enable_nearest_points=True - ) + req = fcl.DistanceRequest(enable_signed_distance=True, enable_nearest_points=True) ddata = fcl.DistanceData(req) self.mgr2.distance(self.mgr1, ddata, fcl.defaultDistanceCallback) assert np.isclose(ddata.result.min_distance, self.act_dist) From 2f67f5b547c6d6ab6844fdb1bba7e13730f8069c Mon Sep 17 00:00:00 2001 From: Eric Vin Date: Tue, 15 Aug 2023 14:17:20 -0700 Subject: [PATCH 07/10] Changed numpy versioning. --- pyproject.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0323d58..6e6a223 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,10 @@ [build-system] -requires = ["setuptools", "wheel", "oldest-supported-numpy", "Cython<3.0"] +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] From 74215b3eab0673b7bbf1a265ecbfef4220a485b2 Mon Sep 17 00:00:00 2001 From: Eric Vin Date: Tue, 15 Aug 2023 15:37:30 -0700 Subject: [PATCH 08/10] Changed installed numpy version to fixed versions. --- setup.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index c7a244e..ab8a321 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,10 +31,12 @@ package_dir = = src packages = find: setup_requires = - numpy + oldest-supported-numpy; python_version<'3.12' + numpy>=1.26.0b1; python_version>='3.12' Cython install_requires = - numpy + oldest-supported-numpy; python_version<'3.12' + numpy>=1.26.0b1; python_version>='3.12' Cython [options.package_data] From 17d1b5697ce51ac1d4cdff8b71f05d2bc24e1270 Mon Sep 17 00:00:00 2001 From: Eric Vin Date: Tue, 15 Aug 2023 19:39:31 -0700 Subject: [PATCH 09/10] Try changing back from oldest-supported-numpy to numpy --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index ab8a321..7cc2386 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,11 +31,11 @@ package_dir = = src packages = find: setup_requires = - oldest-supported-numpy; python_version<'3.12' + numpy; python_version<'3.12' numpy>=1.26.0b1; python_version>='3.12' Cython install_requires = - oldest-supported-numpy; python_version<'3.12' + numpy; python_version<'3.12' numpy>=1.26.0b1; python_version>='3.12' Cython From 43ebd59808ca9227977b26db97f120cc0cf552cc Mon Sep 17 00:00:00 2001 From: Eric Vin Date: Wed, 16 Aug 2023 09:58:26 -0700 Subject: [PATCH 10/10] Tweak to avoid double specifying numpy? --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7cc2386..1283084 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,8 +31,7 @@ package_dir = = src packages = find: setup_requires = - numpy; python_version<'3.12' - numpy>=1.26.0b1; python_version>='3.12' + numpy Cython install_requires = numpy; python_version<'3.12'