Merge remote-tracking branch 'upstream/sdf13' into embeddedsdf_refactoring

azeey · azeey · commit 403dda1f9b35 · 2022-10-11T18:19:24.000-05:00
diff --git a/python/test/gz_test_deps/README b/python/test/gz_test_deps/README
@@ -0,0 +1,8 @@
+This python package encapsulates versioned python packages of gz library 
+bindings such that the version number only has to be changed in this package. 
+Here's an example of how to use this in a python test:
+
+```python
+from gz_test_deps import math  # instead of from gz import math7
+from gz_test_deps.math import Vector3d  # instead of from gz.math7 import Vector3d
+```
diff --git a/python/test/gz_test_deps/__init__.py b/python/test/gz_test_deps/__init__.py
diff --git a/python/test/gz_test_deps/math.py b/python/test/gz_test_deps/math.py
@@ -0,0 +1 @@
+from gz.math7 import *
diff --git a/python/test/gz_test_deps/sdformat.py b/python/test/gz_test_deps/sdformat.py
@@ -0,0 +1 @@
+from sdformat13 import *
diff --git a/python/test/pyAirPressure_TEST.py b/python/test/pyAirPressure_TEST.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sdformat13 import AirPressure, Noise
-import sdformat13 as sdf
+from gz_test_deps.sdformat import AirPressure, Noise
+import gz_test_deps.sdformat as sdf
 import unittest
 
 class AtmosphereTEST(unittest.TestCase):
diff --git a/python/test/pyAltimeter_TEST.py b/python/test/pyAltimeter_TEST.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sdformat13 import Altimeter, Noise
-import sdformat13 as sdf
+from gz_test_deps.sdformat import Altimeter, Noise
+import gz_test_deps.sdformat as sdf
 import unittest
 
 
diff --git a/python/test/pyAtmosphere_TEST.py b/python/test/pyAtmosphere_TEST.py
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gz.math7 import Temperature
-from sdformat13 import Atmosphere
-import sdformat13 as sdf
+from gz_test_deps.math import Temperature
+from gz_test_deps.sdformat import Atmosphere
+import gz_test_deps.sdformat as sdf
 import unittest
 
 class AtmosphereTEST(unittest.TestCase):
diff --git a/python/test/pyBox_TEST.py b/python/test/pyBox_TEST.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gz.math7 import Vector3d
-from sdformat13 import Box
+from gz_test_deps.math import Vector3d
+from gz_test_deps.sdformat import Box
 import unittest
 
 class BoxTEST(unittest.TestCase):
diff --git a/python/test/pyCamera_TEST.py b/python/test/pyCamera_TEST.py
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Angle, Pose3d, Vector2d
+from gz_test_deps.math import Angle, Pose3d, Vector2d
 import math
-from sdformat13 import Camera
-import sdformat13 as sdf
+from gz_test_deps.sdformat import Camera
+import gz_test_deps.sdformat as sdf
 import unittest
 
 class CameraTEST(unittest.TestCase):
diff --git a/python/test/pyCapsule_TEST.py b/python/test/pyCapsule_TEST.py
@@ -16,7 +16,7 @@
 
 import math
 
-from sdformat13 import Capsule
+from gz_test_deps.sdformat import Capsule
 
 import unittest
 
diff --git a/python/test/pyCollision_TEST.py b/python/test/pyCollision_TEST.py
@@ -13,10 +13,11 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Pose3d
-from sdformat13 import (Box, Collision, Contact, Cylinder, Error, Geometry,
-                      Plane, Surface, Sphere, SDFErrorsException)
-import sdformat13 as sdf
+from gz_test_deps.math import Pose3d
+from gz_test_deps.sdformat import (Box, Collision, Contact, Cylinder, Error,
+                                   Geometry, Plane, Surface, Sphere,
+                                   SDFErrorsException)
+import gz_test_deps.sdformat as sdf
 import unittest
 import math
 
diff --git a/python/test/pyCylinder_TEST.py b/python/test/pyCylinder_TEST.py
@@ -16,7 +16,7 @@
 
 import math
 
-from sdformat13 import Cylinder
+from gz_test_deps.sdformat import Cylinder
 
 import unittest
 
diff --git a/python/test/pyEllipsoid_TEST.py b/python/test/pyEllipsoid_TEST.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Vector3d
+from gz_test_deps.math import Vector3d
 import math
-from sdformat13 import Ellipsoid
+from gz_test_deps.sdformat import Ellipsoid
 import unittest
 
 
diff --git a/python/test/pyError_TEST.py b/python/test/pyError_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Error
-import sdformat13 as sdf
+from gz_test_deps.sdformat import Error
+import gz_test_deps.sdformat as sdf
 import unittest
 
 class ErrorColor(unittest.TestCase):
diff --git a/python/test/pyForceTorque_TEST.py b/python/test/pyForceTorque_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import ForceTorque, Noise
-import sdformat13 as sdf
+from gz_test_deps.sdformat import ForceTorque, Noise
+import gz_test_deps.sdformat as sdf
 import unittest
 
 class ForceTorqueTEST(unittest.TestCase):
diff --git a/python/test/pyFrame_TEST.py b/python/test/pyFrame_TEST.py
@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import copy
-from gz.math7 import Pose3d
-from sdformat13 import Frame, Error, SDFErrorsException, ErrorCode
+from gz_test_deps.math import Pose3d
+from gz_test_deps.sdformat import Frame, Error, SDFErrorsException, ErrorCode
 import unittest
 import math
 
diff --git a/python/test/pyGeometry_TEST.py b/python/test/pyGeometry_TEST.py
@@ -13,9 +13,10 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Geometry, Box, Capsule, Cylinder, Ellipsoid, Mesh, Plane, Sphere
-from gz.math7 import Vector3d, Vector2d
-import sdformat13 as sdf
+from gz_test_deps.sdformat import (Geometry, Box, Capsule, Cylinder, Ellipsoid,
+                                   Mesh, Plane, Sphere)
+from gz_test_deps.math import Vector3d, Vector2d
+import gz_test_deps.sdformat as sdf
 import unittest
 
 
diff --git a/python/test/pyGui_TEST.py b/python/test/pyGui_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Gui, Plugin
+from gz_test_deps.sdformat import Gui, Plugin
 import unittest
 
 
diff --git a/python/test/pyHeightmap_TEST.py b/python/test/pyHeightmap_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Vector3d
-from sdformat13 import Heightmap, HeightmapBlend, HeightmapTexture
+from gz_test_deps.math import Vector3d
+from gz_test_deps.sdformat import Heightmap, HeightmapBlend, HeightmapTexture
 import unittest
 
 
diff --git a/python/test/pyIMU_TEST.py b/python/test/pyIMU_TEST.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Vector3d
-from sdformat13 import IMU, Noise
-import sdformat13 as sdf
+from gz_test_deps.math import Vector3d
+from gz_test_deps.sdformat import IMU, Noise
+import gz_test_deps.sdformat as sdf
 import unittest
 
 class IMUTest(unittest.TestCase):
diff --git a/python/test/pyJointAxis_TEST.py b/python/test/pyJointAxis_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Vector3d
-from sdformat13 import JointAxis, Error, SDFErrorsException
+from gz_test_deps.math import Vector3d
+from gz_test_deps.sdformat import JointAxis, Error, SDFErrorsException
 import math
 import unittest
 
diff --git a/python/test/pyJoint_TEST.py b/python/test/pyJoint_TEST.py
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Pose3d, Vector3d
-from sdformat13 import (Joint, JointAxis, Error, SemanticPose, Sensor,
-                      SDFErrorsException)
-import sdformat13 as sdf
+from gz_test_deps.math import Pose3d, Vector3d
+from gz_test_deps.sdformat import (Joint, JointAxis, Error, SemanticPose,
+                                   Sensor, SDFErrorsException)
+import gz_test_deps.sdformat as sdf
 import math
 import unittest
 
diff --git a/python/test/pyLidar_TEST.py b/python/test/pyLidar_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Angle, Helpers
-from sdformat13 import Lidar, Error, Noise
+from gz_test_deps.math import Angle, Helpers
+from gz_test_deps.sdformat import Lidar, Error, Noise
 import math
 import unittest
 
diff --git a/python/test/pyLight_TEST.py b/python/test/pyLight_TEST.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Angle, Color, Pose3d, Vector3d
-from sdformat13 import Light, SDFErrorsException
-import sdformat13 as sdf
+from gz_test_deps.math import Angle, Color, Pose3d, Vector3d
+from gz_test_deps.sdformat import Light, SDFErrorsException
+import gz_test_deps.sdformat as sdf
 import math
 import unittest
 
diff --git a/python/test/pyLink_TEST.py b/python/test/pyLink_TEST.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Pose3d, Inertiald, MassMatrix3d, Vector3d
-from sdformat13 import (Collision, Light, Link, Sensor, Visual,
-                      SDFErrorsException)
+from gz_test_deps.math import Pose3d, Inertiald, MassMatrix3d, Vector3d
+from gz_test_deps.sdformat import (Collision, Light, Link, Sensor, Visual,
+                                   SDFErrorsException)
 import unittest
 import math
 
diff --git a/python/test/pyMagnetometer_TEST.py b/python/test/pyMagnetometer_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Magnetometer, Noise
-import sdformat13 as sdf
+from gz_test_deps.sdformat import Magnetometer, Noise
+import gz_test_deps.sdformat as sdf
 import unittest
 
 
diff --git a/python/test/pyMaterial_TEST.py b/python/test/pyMaterial_TEST.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Material, Pbr, PbrWorkflow
-from gz.math7 import Color
-import sdformat13 as sdf
+from gz_test_deps.sdformat import Material, Pbr, PbrWorkflow
+from gz_test_deps.math import Color
+import gz_test_deps.sdformat as sdf
 import unittest
 
 
diff --git a/python/test/pyMesh_TEST.py b/python/test/pyMesh_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Mesh
-from gz.math7 import Vector3d
+from gz_test_deps.sdformat import Mesh
+from gz_test_deps.math import Vector3d
 import unittest
 
 
diff --git a/python/test/pyModel_TEST.py b/python/test/pyModel_TEST.py
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Pose3d
-from sdformat13 import (Plugin, Model, Joint, Link, Error, Frame, SemanticPose,
-                      SDFErrorsException)
-import sdformat13 as sdf
+from gz_test_deps.math import Pose3d
+from gz_test_deps.sdformat import (Plugin, Model, Joint, Link, Error, Frame,
+                                   SemanticPose, SDFErrorsException)
+import gz_test_deps.sdformat as sdf
 import math
 import unittest
 
diff --git a/python/test/pyNavSat_TEST.py b/python/test/pyNavSat_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import NavSat, Noise
+from gz_test_deps.sdformat import NavSat, Noise
 import unittest
 
 class NavSatColor(unittest.TestCase):
diff --git a/python/test/pyNoise_TEST.py b/python/test/pyNoise_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Noise
-import sdformat13 as sdf
+from gz_test_deps.sdformat import Noise
+import gz_test_deps.sdformat as sdf
 import math
 import unittest
 
diff --git a/python/test/pyParserConfig_TEST.py b/python/test/pyParserConfig_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import ParserConfig
+from gz_test_deps.sdformat import ParserConfig
 from sdformattest import source_file, test_file
 import unittest
 
diff --git a/python/test/pyParticleEmitter_TEST.py b/python/test/pyParticleEmitter_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from gz.math7 import Color, Pose3d, Vector3d, Helpers
-from sdformat13 import ParticleEmitter
+from gz_test_deps.math import Color, Pose3d, Vector3d, Helpers
+from gz_test_deps.sdformat import ParticleEmitter
 import unittest
 
 
diff --git a/python/test/pyPbr_TEST.py b/python/test/pyPbr_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Pbr, PbrWorkflow
-import sdformat13 as sdf
+from gz_test_deps.sdformat import Pbr, PbrWorkflow
+import gz_test_deps.sdformat as sdf
 import unittest
 
 
diff --git a/python/test/pyPhysics_TEST.py b/python/test/pyPhysics_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Physics
+from gz_test_deps.sdformat import Physics
 import unittest
 
 
diff --git a/python/test/pyPlane_TEST.py b/python/test/pyPlane_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Plane
-from gz.math7 import Vector3d, Vector2d
+from gz_test_deps.sdformat import Plane
+from gz_test_deps.math import Vector3d, Vector2d
 import unittest
 
 
diff --git a/python/test/pyPlugin_TEST.py b/python/test/pyPlugin_TEST.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from sdformat13 import Plugin
+from gz_test_deps.sdformat import Plugin
 import unittest
 
 
diff --git a/python/test/pyPolyline_TEST.py b/python/test/pyPolyline_TEST.py
diff --git a/python/test/pyRoot_TEST.py b/python/test/pyRoot_TEST.py
diff --git a/python/test/pyScene_TEST.py b/python/test/pyScene_TEST.py
diff --git a/python/test/pySemanticPose_TEST.py b/python/test/pySemanticPose_TEST.py
diff --git a/python/test/pySensor_TEST.py b/python/test/pySensor_TEST.py
diff --git a/python/test/pySky_TEST.py b/python/test/pySky_TEST.py
diff --git a/python/test/pySphere_TEST.py b/python/test/pySphere_TEST.py
diff --git a/python/test/pySurface_TEST.py b/python/test/pySurface_TEST.py
diff --git a/python/test/pyVisual_TEST.py b/python/test/pyVisual_TEST.py
diff --git a/python/test/pyWorld_TEST.py b/python/test/pyWorld_TEST.py
