- changed the shapely imports a bit according to the specifications of Shapely 2.0

- changed the requirements.txt file to reflect the need for at least Shapely in version 2.0

appObjects/AppObjectTemplate.py

@@ -18,7 +18,7 @@ from appGUI.PlotCanvasLegacy import ShapeCollectionLegacy
 from appGUI.VisPyVisuals import ShapeCollection
 
 from shapely.ops import unary_union
-from shapely.geometry import Polygon, MultiPolygon, Point, LineString
+from shapely import Polygon, MultiPolygon, Point, LineString
 
 from copy import deepcopy, copy
 import sys

appObjects/ExcellonObject.py

@@ -21,7 +21,7 @@ import itertools
 import numpy as np
 from copy import deepcopy
 
-from shapely.geometry import LineString
+from shapely import LineString
 
 import gettext
 import appTranslation as fcTranslate

appObjects/GeometryObject.py

@@ -15,7 +15,7 @@ from appObjects.AppObjectTemplate import FlatCAMObj, ObjectDeleted
 from appGUI.GUIElements import FCCheckBox
 from appGUI.ObjectUI import GeometryObjectUI
 
-from shapely.geometry import MultiLineString, LinearRing, Polygon, MultiPolygon, LineString
+from shapely import MultiLineString, LinearRing, Polygon, MultiPolygon, LineString
 from shapely.affinity import scale, translate
 from shapely.ops import unary_union
 

appObjects/GerberObject.py

@@ -18,7 +18,7 @@ from appObjects.AppObjectTemplate import FlatCAMObj, ObjectDeleted, ValidationEr
 
 from camlib import flatten_shapely_geometry
 
-from shapely.geometry import MultiLineString, LinearRing, MultiPolygon, Polygon, LineString, Point
+from shapely import MultiLineString, LinearRing, MultiPolygon, Polygon, LineString, Point
 from shapely.ops import unary_union
 
 import numpy as np