Merge pull request #1215 from CadQuery/ocp77

OCP 7.7.0

Author: jmwright

conda/meta.yaml

@@ -15,7 +15,7 @@ requirements:
     - setuptools
   run:
     - python {{ environ.get('PYTHON_VERSION') }}
-    - ocp 7.6.*
+    - ocp 7.7.*
     - pyparsing >=2.1.9
     - ezdxf
     - ipython

environment.yml

@@ -6,7 +6,7 @@ channels:
 dependencies:
   - python>=3.8
   - ipython
-  - ocp=7.6.*
+  - ocp=7.7.*
   - pyparsing>=2.1.9
   - sphinx=5.0.1
   - sphinx_rtd_theme

tests/test_cadquery.py

@@ -5410,10 +5410,10 @@ def test_project(self):
         t = Compound.makeText("T", 5, 0).Faces()[0]
         f = Workplane("XZ", origin=(0, 0, -7)).sphere(6).faces("not %PLANE").val()
 
-        res = t.project(f, (0, 0, -1))
+        res = t.project(f, (0, 0, 1))
 
         assert res.isValid()
-        assert len(res.Edges()) == 8
+        assert len(res.Edges()) == len(t.Edges())
         assert t.distance(res) == approx(1)
 
         # extrude it
@@ -5425,12 +5425,12 @@ def test_project(self):
         # project a wire
         w = t.outerWire()
 
-        res_w = w.project(f, (0, 0, -1))
+        res_w = w.project(f, (0, 0, 1))
 
         assert len(res_w.Edges()) == 8
         assert res_w.isValid()
 
-        res_w1, res_w2 = w.project(f, (0, 0, -1), False)
+        res_w1, res_w2 = w.project(f, (0, 0, 1), False)
 
         assert len(res_w1.Edges()) == 8
         assert len(res_w2.Edges()) == 8
@@ -5439,7 +5439,7 @@ def test_project(self):
         o = Compound.makeText("O", 5, 0).Faces()[0]
         f = Workplane("XZ", origin=(0, 0, -7)).sphere(6).faces("not %PLANE").val()
 
-        res_o = o.project(f, (0, 0, -1))
+        res_o = o.project(f, (0, 0, 1))
 
         assert res_o.isValid()
 

tests/test_exporters.py

@@ -299,11 +299,11 @@ def test_stl_ascii(tmpdir, box123, id, opt, matchvals):
 @pytest.mark.parametrize(
     "id, opt, matchval",
     [
-        (0, None, b"STL Exported by OpenCASCADE"),
-        (1, {"ascii": False}, b"STL Exported by OpenCASCADE"),
-        (2, {"ASCII": False}, b"STL Exported by OpenCASCADE"),
-        (3, {"unknown_opt": 1}, b"STL Exported by OpenCASCADE"),
-        (4, {"unknown_opt": 1, "ascii": False}, b"STL Exported by OpenCASCADE"),
+        (0, None, b"STL Exported by Open CASCADE"),
+        (1, {"ascii": False}, b"STL Exported by Open CASCADE"),
+        (2, {"ASCII": False}, b"STL Exported by Open CASCADE"),
+        (3, {"unknown_opt": 1}, b"STL Exported by Open CASCADE"),
+        (4, {"unknown_opt": 1, "ascii": False}, b"STL Exported by Open CASCADE"),
     ],
 )
 def test_stl_binary(tmpdir, box123, id, opt, matchval):