Merge pull request #146 from SpectralVectors/master

Shapely Install Error Fix

scripts/addons/cam/__init__.py

@@ -18,6 +18,21 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ***** END GPL LICENCE BLOCK ****
+import subprocess
+import sys
+try:
+    import shapely
+except ModuleNotFoundError:
+    # pip install required python stuff
+    subprocess.check_call([sys.executable, "-m", "ensurepip"])
+    subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade", " pip"])
+    subprocess.check_call([sys.executable, "-m", "pip", "install",
+                           "shapely", "Equation", "opencamlib"])
+    # install numba if available for this platform, ignore failure
+    subprocess.run([sys.executable, "-m", "pip", "install", "numba"])
+
+from shapely import geometry as sgeometry  # noqa
+
 from .ui import *
 from .version import __version__
 from . import (
@@ -77,30 +92,15 @@
 import os
 import pickle
 import shutil
-import subprocess
-import sys
 import threading
 import time
 
 from pathlib import Path
 
-try:
-    import shapely
-except ImportError:
-    # pip install required python stuff
-    subprocess.check_call([sys.executable, "-m", "ensurepip"])
-    subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade", " pip"])
-    subprocess.check_call([sys.executable, "-m", "pip", "install",
-                           "shapely", "Equation", "opencamlib"])
-    # install numba if available for this platform, ignore failure
-    subprocess.run([sys.executable, "-m", "pip", "install", "numba"])
-
-from shapely import geometry as sgeometry  # noqa
-
 bl_info = {
     "name": "CAM - gcode generation tools",
     "author": "Vilem Novak & Contributors",
-    "version":(1,0,10),
+    "version":(1,0,11),
     "blender": (3, 6, 0),
     "location": "Properties > render",
     "description": "Generate machining paths for CNC",

scripts/addons/cam/version.py

@@ -1 +1 @@
-__version__=(1,0,10)
+__version__=(1,0,11)