- 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

appParsers/ParseDXF.py

@@ -8,7 +8,7 @@
 from appParsers.ParseDXF_Spline import spline2Polyline, normalize_2
 from appParsers.ParseDXF_Spline import Vector as DxfVector
 
-from shapely.geometry import LineString, Point, Polygon
+from shapely import LineString, Point, Polygon
 from shapely.affinity import rotate, translate, scale
 # from ezdxf.math import Vector as ezdxf_vector
 from ezdxf.math import Vec3 as ezdxf_vector

appParsers/ParseExcellon.py

@@ -9,7 +9,7 @@
 from camlib import Geometry, grace
 
 import shapely.affinity as affinity
-from shapely.geometry import Point, LineString, LinearRing, MultiLineString, MultiPolygon
+from shapely import Point, LineString, LinearRing, MultiLineString, MultiPolygon
 import numpy as np
 
 import re

appParsers/ParseFont.py

@@ -15,7 +15,7 @@ import os
 import sys
 import glob
 
-from shapely.geometry import Polygon, MultiPolygon
+from shapely import Polygon, MultiPolygon
 from shapely.affinity import translate, scale
 
 import freetype as ft

appParsers/ParseGerber.py

@@ -11,8 +11,8 @@ from copy import deepcopy
 
 from shapely.ops import unary_union, linemerge
 import shapely.affinity as affinity
-from shapely.geometry import box as shply_box
-from shapely.geometry import LinearRing, MultiLineString, LineString, Polygon, MultiPolygon, Point
+from shapely import box as shply_box
+from shapely import LinearRing, MultiLineString, LineString, Polygon, MultiPolygon, Point
 
 from lxml import etree as ET
 import ezdxf

appParsers/ParseHPGL2.py

@@ -16,7 +16,7 @@ from copy import deepcopy
 import sys
 
 from shapely.ops import unary_union
-from shapely.geometry import LineString, Point
+from shapely import LineString, Point
 
 import gettext
 import builtins

appParsers/ParsePDF.py

@@ -9,7 +9,7 @@ from PyQt6 import QtCore
 
 from appCommon.Common import GracefulException as grace
 
-from shapely.geometry import Polygon, LineString, MultiPolygon
+from shapely import Polygon, LineString, MultiPolygon
 
 from copy import copy, deepcopy
 import numpy as np

appParsers/ParseSVG.py

@@ -24,7 +24,7 @@ from svg.path import Line, Arc, CubicBezier, QuadraticBezier, parse_path
 # from svg.path.path import Move
 # from svg.path.path import Close
 import svg.path
-from shapely.geometry import LineString, MultiLineString, Point
+from shapely import LineString, MultiLineString, Point
 from shapely.affinity import skew, affine_transform, rotate
 import numpy as np