- 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

tclCommands/TclCommandAddDrill.py

@@ -1,6 +1,6 @@
 from tclCommands.TclCommand import *
 from copy import deepcopy
-from shapely.geometry import Point
+from shapely import Point
 
 
 class TclCommandAddDrill(TclCommandSignaled):

tclCommands/TclCommandAddSlot.py

@@ -1,6 +1,6 @@
 from tclCommands.TclCommand import *
 from copy import deepcopy
-from shapely.geometry import Point
+from shapely import Point
 
 
 class TclCommandAddSlot(TclCommandSignaled):

tclCommands/TclCommandAlignDrill.py

@@ -1,7 +1,7 @@
 import collections
 from tclCommands.TclCommand import TclCommandSignaled
 
-from shapely.geometry import Point
+from shapely import Point
 import shapely.affinity as affinity
 from copy import deepcopy
 

tclCommands/TclCommandAlignDrillGrid.py

@@ -1,7 +1,7 @@
 import collections
 from tclCommands.TclCommand import TclCommandSignaled
 
-from shapely.geometry import Point
+from shapely import Point
 from copy import deepcopy
 
 

tclCommands/TclCommandCutout.py

@@ -5,7 +5,7 @@ from tclCommands.TclCommand import TclCommand
 import collections
 from copy import deepcopy
 
-from shapely.geometry import box
+from shapely import box
 from shapely.ops import linemerge
 from camlib import flatten_shapely_geometry
 

tclCommands/TclCommandGeoCutout.py

@@ -4,7 +4,7 @@ import logging
 import collections
 from copy import deepcopy
 from shapely.ops import unary_union
-from shapely.geometry import Polygon, LineString, LinearRing, MultiPolygon, MultiLineString
+from shapely import Polygon, LineString, LinearRing, MultiPolygon, MultiLineString
 
 import gettext
 import appTranslation as fcTranslate

tclCommands/TclCommandPanelize.py

@@ -1,7 +1,7 @@
 from tclCommands.TclCommand import TclCommand
 
 import shapely.affinity as affinity
-from shapely.geometry import MultiPolygon, MultiLineString
+from shapely import MultiPolygon, MultiLineString
 
 import logging
 from copy import deepcopy