From a5a290d52b5de38fbd21dc25e1eea986d67a80f9 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 19 Sep 2024 12:24:31 -0500 Subject: [PATCH 1/5] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 007963aa..4ec279ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ classifiers = [ dependencies = [ "cadquery-ocp >= 7.7.0", "typing_extensions >= 4.6.0, <5", - "numpy >= 1.24.1, <2", + "numpy >= 2", "svgpathtools >= 1.5.1, <2", "anytree >= 2.8.0, <3", "ezdxf >= 1.1.0, < 2", From 025d0727a3f0c93240e979ce5a58a8a5736f56b7 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 19 Sep 2024 13:23:59 -0500 Subject: [PATCH 2/5] test_exporters3d.py -> fix deprecation warning on regex --- tests/test_exporters3d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_exporters3d.py b/tests/test_exporters3d.py index 6af0d53b..26059d79 100644 --- a/tests/test_exporters3d.py +++ b/tests/test_exporters3d.py @@ -90,7 +90,7 @@ def test_export_step_assembly(self): os.remove("assembly.step") self.assertNotEqual(step_data.find("DRAUGHTING_PRE_DEFINED_COLOUR('red')"), -1) self.assertNotEqual(step_data.find("DRAUGHTING_PRE_DEFINED_COLOUR('blue')"), -1) - self.assertEqual(len(re.findall("[\(\,]25.4[\,\)]", step_data)), 45) + self.assertEqual(len(re.findall("[(,]25.4[,)]", step_data)), 45) self.assertNotEqual(step_data.find("PRODUCT('sphere',"), -1) self.assertNotEqual(step_data.find("PRODUCT('box',"), -1) self.assertNotEqual(step_data.find("PRODUCT('assembly',"), -1) From 2d47621a0f2362f30cba8105c363bd42cfc4e39c Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 19 Sep 2024 15:30:13 -0500 Subject: [PATCH 3/5] importers.py -> fix bug relating to casting np.float64 to float in import_svg_as_buildline_code --- src/build123d/importers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/build123d/importers.py b/src/build123d/importers.py index 319c0dee..483c3de3 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -294,9 +294,7 @@ def import_svg_as_buildline_code(file_name: str) -> tuple[str, str]: for curve in path: class_name = type(curve).__name__ if class_name == "Arc": - values = [ - (curve.__dict__["center"].real, curve.__dict__["center"].imag) - ] + values = [curve.__dict__["center"]] values.append(curve.__dict__["radius"].real) values.append(curve.__dict__["radius"].imag) start, end = sorted( From cffe4dc35641dcc539ba25ad269ffcd4a37edee7 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 19 Sep 2024 15:34:55 -0500 Subject: [PATCH 4/5] pyproject.toml -> "numpy >= 2, <3", --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4ec279ec..7790b684 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ classifiers = [ dependencies = [ "cadquery-ocp >= 7.7.0", "typing_extensions >= 4.6.0, <5", - "numpy >= 2", + "numpy >= 2, <3", "svgpathtools >= 1.5.1, <2", "anytree >= 2.8.0, <3", "ezdxf >= 1.1.0, < 2", From 24b8d03bd94aa5eaa5033bf9b6c9f0e99544e2d0 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 19 Sep 2024 15:44:11 -0500 Subject: [PATCH 5/5] installation.rst -> update macos workaround --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 918441ca..3a54c1df 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -132,7 +132,7 @@ A procedure for avoiding this issue is to install in a conda environment, which conda activate conda install -c cadquery -c conda-forge cadquery=master pip install svgwrite svgpathtools anytree scipy ipython trianglesolver \ - ocp_tessellate webcolors==1.12 numpy numpy-quaternion cachetools==5.2.0 \ + ocp_tessellate webcolors==1.12 "numpy>=2,<3" cachetools==5.2.0 \ ocp_vscode requests orjson urllib3 certifi py-lib3mf \ "svgpathtools>=1.5.1,<2" "svgelements>=1.9.1,<2" "ezdxf>=1.1.0,<2" pip install --no-deps build123d ocpsvg