From c462492a63c3d37597c04cbc485ecf366462baef Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 15 Sep 2022 19:39:07 +0200 Subject: [PATCH] Use gz.math7 Signed-off-by: Jose Luis Rivero --- python/test/pyAirPressure_TEST.py | 2 +- python/test/pyAltimeter_TEST.py | 2 +- python/test/pyAtmosphere_TEST.py | 2 +- python/test/pyBox_TEST.py | 2 +- python/test/pyCamera_TEST.py | 2 +- python/test/pyCapsule_TEST.py | 2 +- python/test/pyCollision_TEST.py | 2 +- python/test/pyCylinder_TEST.py | 2 +- python/test/pyEllipsoid_TEST.py | 2 +- python/test/pyFrame_TEST.py | 2 +- python/test/pyGeometry_TEST.py | 2 +- python/test/pyHeightmap_TEST.py | 2 +- python/test/pyIMU_TEST.py | 2 +- python/test/pyJointAxis_TEST.py | 2 +- python/test/pyJoint_TEST.py | 2 +- python/test/pyLidar_TEST.py | 2 +- python/test/pyLight_TEST.py | 2 +- python/test/pyLink_TEST.py | 2 +- python/test/pyMagnetometer_TEST.py | 2 +- python/test/pyMaterial_TEST.py | 2 +- python/test/pyMesh_TEST.py | 2 +- python/test/pyModel_TEST.py | 2 +- python/test/pyParticleEmitter_TEST.py | 2 +- python/test/pyPlane_TEST.py | 2 +- python/test/pyPolyline_TEST.py | 2 +- python/test/pyRoot_TEST.py | 2 +- python/test/pyScene_TEST.py | 2 +- python/test/pySemanticPose_TEST.py | 2 +- python/test/pySensor_TEST.py | 2 +- python/test/pySky_TEST.py | 2 +- python/test/pySphere_TEST.py | 2 +- python/test/pySurface_TEST.py | 2 +- python/test/pyVisual_TEST.py | 2 +- python/test/pyWorld_TEST.py | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/python/test/pyAirPressure_TEST.py b/python/test/pyAirPressure_TEST.py index 0b294ade5..f4ce64274 100644 --- a/python/test/pyAirPressure_TEST.py +++ b/python/test/pyAirPressure_TEST.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from gz.math import Vector3d +from gz.math7 import Vector3d from sdformat import AirPressure, Noise import sdformat as sdf import unittest diff --git a/python/test/pyAltimeter_TEST.py b/python/test/pyAltimeter_TEST.py index ff9b9498c..9189303c0 100644 --- a/python/test/pyAltimeter_TEST.py +++ b/python/test/pyAltimeter_TEST.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from gz.math import Vector3d +from gz.math7 import Vector3d from sdformat import Altimeter, Noise import sdformat as sdf import unittest diff --git a/python/test/pyAtmosphere_TEST.py b/python/test/pyAtmosphere_TEST.py index e5162159b..9d08a2a44 100644 --- a/python/test/pyAtmosphere_TEST.py +++ b/python/test/pyAtmosphere_TEST.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from gz.math import Pose3d, Temperature +from gz.math7 import Pose3d, Temperature from sdformat import Atmosphere import sdformat as sdf import unittest diff --git a/python/test/pyBox_TEST.py b/python/test/pyBox_TEST.py index 4eac4f2b7..df609011b 100644 --- a/python/test/pyBox_TEST.py +++ b/python/test/pyBox_TEST.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from gz.math import Vector3d +from gz.math7 import Vector3d from sdformat import Box import unittest diff --git a/python/test/pyCamera_TEST.py b/python/test/pyCamera_TEST.py index e3ec95261..ec0f26499 100644 --- a/python/test/pyCamera_TEST.py +++ b/python/test/pyCamera_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Angle, Pose3d, Vector2d +from gz.math7 import Angle, Pose3d, Vector2d import math from sdformat import Camera import sdformat as sdf diff --git a/python/test/pyCapsule_TEST.py b/python/test/pyCapsule_TEST.py index 1e375dd6e..f2f694c17 100644 --- a/python/test/pyCapsule_TEST.py +++ b/python/test/pyCapsule_TEST.py @@ -14,7 +14,7 @@ import copy -from gz.math import Vector3d, Capsuled +from gz.math7 import Vector3d, Capsuled import math diff --git a/python/test/pyCollision_TEST.py b/python/test/pyCollision_TEST.py index fbb6d5d82..a17f72f45 100644 --- a/python/test/pyCollision_TEST.py +++ b/python/test/pyCollision_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d +from gz.math7 import Pose3d from sdformat import (Box, Collision, Contact, Cylinder, Error, Geometry, Plane, Surface, Sphere, SDFErrorsException) import sdformat as sdf diff --git a/python/test/pyCylinder_TEST.py b/python/test/pyCylinder_TEST.py index 7294abb54..cdd818b25 100644 --- a/python/test/pyCylinder_TEST.py +++ b/python/test/pyCylinder_TEST.py @@ -14,7 +14,7 @@ import copy -from gz.math import Vector3d +from gz.math7 import Vector3d import math diff --git a/python/test/pyEllipsoid_TEST.py b/python/test/pyEllipsoid_TEST.py index c77105f7d..f80bc4889 100644 --- a/python/test/pyEllipsoid_TEST.py +++ b/python/test/pyEllipsoid_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Vector3d, Ellipsoidd +from gz.math7 import Vector3d, Ellipsoidd import math from sdformat import Ellipsoid import unittest diff --git a/python/test/pyFrame_TEST.py b/python/test/pyFrame_TEST.py index bf0dcb9e7..aea698bc0 100644 --- a/python/test/pyFrame_TEST.py +++ b/python/test/pyFrame_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d +from gz.math7 import Pose3d from sdformat import Frame, Error, SDFErrorsException, ErrorCode import unittest import math diff --git a/python/test/pyGeometry_TEST.py b/python/test/pyGeometry_TEST.py index dcee570fb..e1220ef4b 100644 --- a/python/test/pyGeometry_TEST.py +++ b/python/test/pyGeometry_TEST.py @@ -14,7 +14,7 @@ import copy from sdformat import Geometry, Box, Capsule, Cylinder, Ellipsoid, Mesh, Plane, Sphere -from gz.math import Vector3d, Vector2d +from gz.math7 import Vector3d, Vector2d import sdformat as sdf import unittest diff --git a/python/test/pyHeightmap_TEST.py b/python/test/pyHeightmap_TEST.py index d58bfa7ea..ed6186eb4 100644 --- a/python/test/pyHeightmap_TEST.py +++ b/python/test/pyHeightmap_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Vector3d +from gz.math7 import Vector3d from sdformat import Heightmap, HeightmapBlend, HeightmapTexture import unittest diff --git a/python/test/pyIMU_TEST.py b/python/test/pyIMU_TEST.py index 8eda014ec..42885ab7d 100644 --- a/python/test/pyIMU_TEST.py +++ b/python/test/pyIMU_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Vector3d +from gz.math7 import Vector3d from sdformat import IMU, Noise import sdformat as sdf import unittest diff --git a/python/test/pyJointAxis_TEST.py b/python/test/pyJointAxis_TEST.py index b5f68f34f..c158a6f23 100644 --- a/python/test/pyJointAxis_TEST.py +++ b/python/test/pyJointAxis_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d, Vector3d +from gz.math7 import Pose3d, Vector3d from sdformat import JointAxis, Error, SDFErrorsException import math import unittest diff --git a/python/test/pyJoint_TEST.py b/python/test/pyJoint_TEST.py index f0ad371a9..ccbea9487 100644 --- a/python/test/pyJoint_TEST.py +++ b/python/test/pyJoint_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d, Vector3d +from gz.math7 import Pose3d, Vector3d from sdformat import (Joint, JointAxis, Error, SemanticPose, Sensor, SDFErrorsException) import sdformat as sdf diff --git a/python/test/pyLidar_TEST.py b/python/test/pyLidar_TEST.py index b9ea1b7bb..871f7c2e6 100644 --- a/python/test/pyLidar_TEST.py +++ b/python/test/pyLidar_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Angle, Pose3d, Vector3d, Helpers +from gz.math7 import Angle, Pose3d, Vector3d, Helpers from sdformat import Lidar, Error, Noise import math import unittest diff --git a/python/test/pyLight_TEST.py b/python/test/pyLight_TEST.py index 167757e4c..d7d9657f6 100644 --- a/python/test/pyLight_TEST.py +++ b/python/test/pyLight_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Angle, Color, Pose3d, Vector3d +from gz.math7 import Angle, Color, Pose3d, Vector3d from sdformat import Light, SDFErrorsException import sdformat as sdf import math diff --git a/python/test/pyLink_TEST.py b/python/test/pyLink_TEST.py index 4bb10665c..e4f8f2141 100644 --- a/python/test/pyLink_TEST.py +++ b/python/test/pyLink_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d, Inertiald, MassMatrix3d, Vector3d +from gz.math7 import Pose3d, Inertiald, MassMatrix3d, Vector3d from sdformat import (Collision, Light, Link, Sensor, Visual, SDFErrorsException) import unittest diff --git a/python/test/pyMagnetometer_TEST.py b/python/test/pyMagnetometer_TEST.py index 6a7597346..bb0ece24c 100644 --- a/python/test/pyMagnetometer_TEST.py +++ b/python/test/pyMagnetometer_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d +from gz.math7 import Pose3d from sdformat import Magnetometer, Noise import sdformat as sdf import unittest diff --git a/python/test/pyMaterial_TEST.py b/python/test/pyMaterial_TEST.py index ec180df6d..467682c91 100644 --- a/python/test/pyMaterial_TEST.py +++ b/python/test/pyMaterial_TEST.py @@ -14,7 +14,7 @@ import copy from sdformat import Material, Pbr, PbrWorkflow -from gz.math import Color +from gz.math7 import Color import sdformat as sdf import unittest diff --git a/python/test/pyMesh_TEST.py b/python/test/pyMesh_TEST.py index a854d5c5f..4f8a0d145 100644 --- a/python/test/pyMesh_TEST.py +++ b/python/test/pyMesh_TEST.py @@ -14,7 +14,7 @@ import copy from sdformat import Mesh -from gz.math import Vector3d +from gz.math7 import Vector3d import unittest diff --git a/python/test/pyModel_TEST.py b/python/test/pyModel_TEST.py index efb0aa303..8abbac38f 100644 --- a/python/test/pyModel_TEST.py +++ b/python/test/pyModel_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d, Vector3d +from gz.math7 import Pose3d, Vector3d from sdformat import (Plugin, Model, Joint, Link, Error, Frame, SemanticPose, SDFErrorsException) import sdformat as sdf diff --git a/python/test/pyParticleEmitter_TEST.py b/python/test/pyParticleEmitter_TEST.py index 2464bb1b2..03cadde60 100644 --- a/python/test/pyParticleEmitter_TEST.py +++ b/python/test/pyParticleEmitter_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Color, Pose3d, Vector3d, Helpers +from gz.math7 import Color, Pose3d, Vector3d, Helpers from sdformat import ParticleEmitter import unittest diff --git a/python/test/pyPlane_TEST.py b/python/test/pyPlane_TEST.py index bd0729f02..baa52b616 100644 --- a/python/test/pyPlane_TEST.py +++ b/python/test/pyPlane_TEST.py @@ -14,7 +14,7 @@ import copy from sdformat import Plane -from gz.math import Vector3d, Vector2d, Planed +from gz.math7 import Vector3d, Vector2d, Planed import unittest diff --git a/python/test/pyPolyline_TEST.py b/python/test/pyPolyline_TEST.py index 2b544e190..3a4f57a89 100644 --- a/python/test/pyPolyline_TEST.py +++ b/python/test/pyPolyline_TEST.py @@ -14,7 +14,7 @@ import copy from sdformat import Polyline -from gz.math import Vector2d +from gz.math7 import Vector2d import unittest diff --git a/python/test/pyRoot_TEST.py b/python/test/pyRoot_TEST.py index 3bd90e9e1..c0909a449 100644 --- a/python/test/pyRoot_TEST.py +++ b/python/test/pyRoot_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Vector3d, Pose3d +from gz.math7 import Vector3d, Pose3d from sdformat import (Error, Model, Light, Root, SDF_VERSION, SDFErrorsException, SDF_PROTOCOL_VERSION, World) import sdformat as sdf diff --git a/python/test/pyScene_TEST.py b/python/test/pyScene_TEST.py index 294149075..d0d572133 100644 --- a/python/test/pyScene_TEST.py +++ b/python/test/pyScene_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Color +from gz.math7 import Color from sdformat import Scene, Sky import unittest diff --git a/python/test/pySemanticPose_TEST.py b/python/test/pySemanticPose_TEST.py index 2a30d1993..06f3b5f6a 100644 --- a/python/test/pySemanticPose_TEST.py +++ b/python/test/pySemanticPose_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d +from gz.math7 import Pose3d from sdformat import Link, SemanticPose import unittest diff --git a/python/test/pySensor_TEST.py b/python/test/pySensor_TEST.py index d389e0efe..69bd50e87 100644 --- a/python/test/pySensor_TEST.py +++ b/python/test/pySensor_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d +from gz.math7 import Pose3d from sdformat import (AirPressure, Altimeter, Camera, IMU, ForceTorque, Lidar, Magnetometer, NavSat, Noise, Plugin, SemanticPose, Sensor, SDFErrorsException) diff --git a/python/test/pySky_TEST.py b/python/test/pySky_TEST.py index 7f58561dc..16c1dda18 100644 --- a/python/test/pySky_TEST.py +++ b/python/test/pySky_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Angle, Color +from gz.math7 import Angle, Color from sdformat import Sky import unittest diff --git a/python/test/pySphere_TEST.py b/python/test/pySphere_TEST.py index 370d574d5..d72b6536c 100644 --- a/python/test/pySphere_TEST.py +++ b/python/test/pySphere_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Sphered +from gz.math7 import Sphered import math from sdformat import Sphere import unittest diff --git a/python/test/pySurface_TEST.py b/python/test/pySurface_TEST.py index 27936dea4..86c4404f8 100644 --- a/python/test/pySurface_TEST.py +++ b/python/test/pySurface_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Vector3d +from gz.math7 import Vector3d from sdformat import Surface, Contact, Friction, ODE import unittest diff --git a/python/test/pyVisual_TEST.py b/python/test/pyVisual_TEST.py index 1733da573..65020546c 100644 --- a/python/test/pyVisual_TEST.py +++ b/python/test/pyVisual_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Pose3d, Color +from gz.math7 import Pose3d, Color from sdformat import Geometry, Material, Visual, Plugin, SDFErrorsException import sdformat as sdf import unittest diff --git a/python/test/pyWorld_TEST.py b/python/test/pyWorld_TEST.py index 88d929ccd..583b1aa5f 100644 --- a/python/test/pyWorld_TEST.py +++ b/python/test/pyWorld_TEST.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -from gz.math import Color, Pose3d, Vector3d, SphericalCoordinates +from gz.math7 import Color, Pose3d, Vector3d, SphericalCoordinates from sdformat import Atmosphere, Gui, Physics, Plugin, Error, Frame, Light, Model, Scene, World import sdformat as sdf import unittest