From 4afefa2a63521ab8090712c4ab1104e5c8efeeec Mon Sep 17 00:00:00 2001 From: Roman Kuzmenko Date: Sun, 3 Nov 2024 18:53:16 -0800 Subject: [PATCH] Troubleshooting --- .github/actions/setup/action.yml | 3 ++- partcad/src/partcad/part_factory_build123d.py | 8 ++++---- partcad/src/partcad/part_factory_cadquery.py | 8 ++++---- partcad/src/partcad/provider_factory_python.py | 8 ++++---- partcad/src/partcad/sketch_factory_build123d.py | 8 ++++---- partcad/src/partcad/sketch_factory_cadquery.py | 8 ++++---- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index cb070694..cf314403 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -57,7 +57,8 @@ runs: if: startsWith(${{matrix.os}}, 'macos') shell: bash run: | - pip install numpy swig + # pip install numpy swig + pip install swig - name: install cadquery-ocp on MacOS (Python 3.10) if: ${{ startsWith(matrix.os, 'macos') && (matrix.os != 'macos-13') && (matrix.python-version == '3.10') }} shell: bash diff --git a/partcad/src/partcad/part_factory_build123d.py b/partcad/src/partcad/part_factory_build123d.py index b4bd11da..5ceffaf6 100644 --- a/partcad/src/partcad/part_factory_build123d.py +++ b/partcad/src/partcad/part_factory_build123d.py @@ -97,10 +97,10 @@ async def instantiate(self, part): await self.runtime.ensure("ocp-tessellate") await self.runtime.ensure("cadquery") - # await self.runtime.ensure("numpy==1.24.1") - # await self.runtime.ensure("numpy-quaternion==2023.0.4") - # await self.runtime.ensure("nptyping==1.4.4") - # await self.runtime.ensure("typing_extensions>=4.6.0,<5") + await self.runtime.ensure("numpy==1.24.1") + await self.runtime.ensure("numpy-quaternion==2023.0.4") + await self.runtime.ensure("nptyping==1.4.4") + await self.runtime.ensure("typing_extensions>=4.6.0,<5") await self.runtime.ensure("build123d>=0.7.0") cwd = self.project.config_dir if self.cwd is not None: diff --git a/partcad/src/partcad/part_factory_cadquery.py b/partcad/src/partcad/part_factory_cadquery.py index 6745551e..91ee744e 100644 --- a/partcad/src/partcad/part_factory_cadquery.py +++ b/partcad/src/partcad/part_factory_cadquery.py @@ -91,10 +91,10 @@ async def instantiate(self, part): await self.runtime.ensure("ocp-tessellate") await self.runtime.ensure("cadquery") - # await self.runtime.ensure("numpy==1.24.1") - # await self.runtime.ensure("numpy-quaternion==2023.0.4") - # await self.runtime.ensure("nptyping==1.4.4") - # await self.runtime.ensure("typing_extensions>=4.6.0,<5") + await self.runtime.ensure("numpy==1.24.1") + await self.runtime.ensure("numpy-quaternion==2023.0.4") + await self.runtime.ensure("nptyping==1.4.4") + await self.runtime.ensure("typing_extensions>=4.6.0,<5") cwd = self.project.config_dir if self.cwd is not None: cwd = os.path.join(self.project.config_dir, self.cwd) diff --git a/partcad/src/partcad/provider_factory_python.py b/partcad/src/partcad/provider_factory_python.py index 39bb3700..2449acdf 100644 --- a/partcad/src/partcad/provider_factory_python.py +++ b/partcad/src/partcad/provider_factory_python.py @@ -134,10 +134,10 @@ async def query_script(self, provider, script_name, request): request_serialized = base64.b64encode(picklestring).decode() await self.runtime.ensure("ocp-tessellate") - # await self.runtime.ensure("numpy==1.24.1") - # await self.runtime.ensure("numpy-quaternion==2023.0.4") - # await self.runtime.ensure("nptyping==1.4.4") - # await self.runtime.ensure("typing_extensions>=4.6.0,<5") + await self.runtime.ensure("numpy==1.24.1") + await self.runtime.ensure("numpy-quaternion==2023.0.4") + await self.runtime.ensure("nptyping==1.4.4") + await self.runtime.ensure("typing_extensions>=4.6.0,<5") await self.runtime.ensure("cadquery") cwd = self.project.config_dir if self.cwd is not None: diff --git a/partcad/src/partcad/sketch_factory_build123d.py b/partcad/src/partcad/sketch_factory_build123d.py index 6e07514e..a083aad6 100644 --- a/partcad/src/partcad/sketch_factory_build123d.py +++ b/partcad/src/partcad/sketch_factory_build123d.py @@ -100,10 +100,10 @@ async def instantiate(self, sketch): await self.runtime.ensure("ocp-tessellate") await self.runtime.ensure("cadquery") - # await self.runtime.ensure("numpy==1.24.1") - # await self.runtime.ensure("numpy-quaternion==2023.0.4") - # await self.runtime.ensure("nptyping==1.4.4") - # await self.runtime.ensure("typing_extensions>=4.6.0,<5") + await self.runtime.ensure("numpy==1.24.1") + await self.runtime.ensure("numpy-quaternion==2023.0.4") + await self.runtime.ensure("nptyping==1.4.4") + await self.runtime.ensure("typing_extensions>=4.6.0,<5") await self.runtime.ensure("build123d>=0.7.0") cwd = self.project.config_dir if self.cwd is not None: diff --git a/partcad/src/partcad/sketch_factory_cadquery.py b/partcad/src/partcad/sketch_factory_cadquery.py index cbb75ff1..d7bc5e26 100644 --- a/partcad/src/partcad/sketch_factory_cadquery.py +++ b/partcad/src/partcad/sketch_factory_cadquery.py @@ -96,10 +96,10 @@ async def instantiate(self, sketch): await self.runtime.ensure("ocp-tessellate") await self.runtime.ensure("cadquery") - # await self.runtime.ensure("numpy==1.24.1") - # await self.runtime.ensure("numpy-quaternion==2023.0.4") - # await self.runtime.ensure("nptyping==1.4.4") - # await self.runtime.ensure("typing_extensions>=4.6.0,<5") + await self.runtime.ensure("numpy==1.24.1") + await self.runtime.ensure("numpy-quaternion==2023.0.4") + await self.runtime.ensure("nptyping==1.4.4") + await self.runtime.ensure("typing_extensions>=4.6.0,<5") cwd = self.project.config_dir if self.cwd is not None: cwd = os.path.join(self.project.config_dir, self.cwd)