Merge branch 'dev' into main

drayde · drayde · commit b334d3e605c9 · 2024-07-10T21:07:35.000+02:00
diff --git a/environment.yml b/environment.yml
@@ -3,6 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python>=3.8,<=3.12
+  - numpy<2
   - ipython
   - ocp=7.7.2
   - vtk=*=qt*
@@ -27,7 +28,7 @@ dependencies:
   - appdirs
   - pip
   - recommonmark
-  - cadquery
+  - cadquery>=2.4
   - pip:
     - sphinx-toolbox>=3.5.0
   
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,4 @@
-cadquery
+# current caadquery 2.4 has an issue with numpy 2.0
+# see https://github.com/CadQuery/cadquery/issues/1616
+numpy<2
+cadquery>=2.4
diff --git a/setup.py b/setup.py
@@ -11,7 +11,8 @@
     author_email='mail@andreaskahler.com',
     packages=find_packages(),
     install_requires=[
-        'cadquery'
+        'numpy<2',
+        'cadquery>=2.4'
     ],
     python_requires=">=3.8",
     classifiers=[
