updates to handle relative pathing for imports so that importing under pytest, internal calls and the library all work together.

includes some mocking around tests so that ocp_vscode.show isn't executing

Author: x0pherl

build.bat

@@ -0,0 +1,28 @@
+@echo off
+setlocal
+
+
+SET PROJECT_NAME=fb-library
+
+SET /P PYTEST_CHOSEN=Do you want to run pytest --cov ([Y]/N)?
+IF /I "%PYTEST_CHOSEN%" NEQ "N" GOTO TEST
+GOTO BUILD
+
+:TEST
+pytest --cov
+
+SET /P PYTEST_CLEAN=Based on the pytest results, proceed with the build? ([Y]/N)?
+IF /I "%PYTEST_CLEAN%" NEQ "N" GOTO BUILD
+
+GOTO END
+
+:BUILD
+py -m pip uninstall -y %PROJECT_NAME%
+
+py -m build
+py -m pip install -e .
+
+:TESTLOCAL
+python -c "exec(\"from fb_library import dovetail_subpart, click_fit, Point, shifted_midpoint\nprint(shifted_midpoint(Point(0,0), Point(10,10),0))\")"
+:END
+endlocal

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fb-library"
-version = "0.0.3"
+version = "0.0.4"
 authors = [
   { name="x0pherl"},
 ]

src/fb_library/__init__.py

@@ -1,6 +1,8 @@
+from .point import Point, midpoint, shifted_midpoint
 from .click_fit import divot
 from .dovetail import (
+    dovetail_subpart,
+    dovetail_subpart_outline,
     dovetail_split_line,
     DovetailPart,
 )
-from .point import Point, midpoint, shifted_midpoint

src/fb_library/dovetail.py

@@ -22,7 +22,7 @@
     loft,
     make_face,
 )
-from point import (
+from fb_library import (
     Point,
     midpoint,
     shifted_midpoint,
@@ -35,7 +35,7 @@ class DovetailPart(Enum):
     SOCKET = 2
 
 
-def subpart_outline(
+def dovetail_subpart_outline(
     part: Part,
     start: Point,
     end: Point,
@@ -123,7 +123,7 @@ def subpart_outline(
     return bottom_tail_line.line
 
 
-def subpart(
+def dovetail_subpart(
     part: Part,
     start: Point,
     end: Point,
@@ -156,7 +156,7 @@ def subpart(
         with BuildSketch(Plane.XY.offset(part.bounding_box().min.Z)):
             with BuildLine():
                 add(
-                    subpart_outline(
+                    dovetail_subpart_outline(
                         part=part,
                         start=start,
                         end=end,
@@ -174,7 +174,7 @@ def subpart(
         with BuildSketch(Plane.XY.offset(part.bounding_box().max.Z)):
             with BuildLine():
                 add(
-                    subpart_outline(
+                    dovetail_subpart_outline(
                         part=part,
                         start=start,
                         end=end,
@@ -308,15 +308,15 @@ def dovetail_split_line(
     with BuildPart() as test:
         Box(10, 50, 2, align=(Align.CENTER, Align.CENTER, Align.MIN))
     show(
-        subpart(
+        dovetail_subpart(
             test.part,
             Point(-5, 0),
             Point(5, 0),
             scarf_distance=0.5,
             section=DovetailPart.TAIL,
             tilt=20,
         ),
-        subpart(
+        dovetail_subpart(
             test.part,
             Point(-5, 0),
             Point(5, 0),

tests/conftest.py

@@ -8,3 +8,7 @@
         os.path.join(os.path.dirname(__file__), "../src/fb_library")
     ),
 )
+sys.path.insert(
+    0,
+    os.path.abspath(os.path.join(os.path.dirname(__file__), "../src")),
+)

tests/test_click_fit.py

@@ -20,7 +20,17 @@ def test_divot(self):
 
     def test_direct_run(self):
 
-        loader = SourceFileLoader("__main__", "src/fb_library/click_fit.py")
-        loader.exec_module(
-            module_from_spec(spec_from_loader(loader.name, loader))
-        )
+        with (
+            patch("build123d.export_stl"),
+            patch("pathlib.Path.mkdir"),
+            patch("pathlib.Path.exists"),
+            patch("pathlib.Path.is_dir"),
+            patch("ocp_vscode.show"),
+            patch("ocp_vscode.save_screenshot"),
+        ):
+            loader = SourceFileLoader(
+                "__main__", "src/fb_library/click_fit.py"
+            )
+            loader.exec_module(
+                module_from_spec(spec_from_loader(loader.name, loader))
+            )