diff --git a/pyproject.toml b/pyproject.toml index 9bf0c99..4f4aee6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,8 @@ classifiers = [ ] dependencies=[ 'gmsh', - 'cadquery2', + 'pyparsing==2.4', + 'cadquery', 'numpy', 'OCP', 'meshio', diff --git a/src/CAD_to_OpenMC/assembly.py b/src/CAD_to_OpenMC/assembly.py index ed50abc..a85a691 100644 --- a/src/CAD_to_OpenMC/assembly.py +++ b/src/CAD_to_OpenMC/assembly.py @@ -1,5 +1,5 @@ import gmsh -import cadquery2 as cq +import cadquery as cq import numpy as np import OCP from collections.abc import Iterable diff --git a/src/CAD_to_OpenMC/assemblymesher_cq.py b/src/CAD_to_OpenMC/assemblymesher_cq.py index 7ade9ac..20f0695 100644 --- a/src/CAD_to_OpenMC/assemblymesher_cq.py +++ b/src/CAD_to_OpenMC/assemblymesher_cq.py @@ -1,4 +1,4 @@ -import cadquery2 as cq +import cadquery as cq import subprocess as sp import pathlib as pl import hashlib as hl diff --git a/src/CAD_to_OpenMC/assemblymesher_gmsh.py b/src/CAD_to_OpenMC/assemblymesher_gmsh.py index 01c9992..0f71a98 100644 --- a/src/CAD_to_OpenMC/assemblymesher_gmsh.py +++ b/src/CAD_to_OpenMC/assemblymesher_gmsh.py @@ -1,5 +1,5 @@ import gmsh -import cadquery2 as cq +import cadquery as cq import os import tempfile import math