Merge branch 'ign-math6' into ahcorde/cylinder/clean_header

gazebosim · Oct 4, 2021 · 7ad391a · 7ad391a
2 parents cc3ad0c + 4c1259a
commit 7ad391a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-math6 VERSION 6.9.0)
+project(ignition-math6 VERSION 6.9.1)
 
 #============================================================================
 # Find ignition-cmake
@@ -15,7 +15,7 @@ find_package(ignition-cmake2 2.8.0 REQUIRED)
 # Configure the project
 #============================================================================
 set (c++standard 17)
-ign_configure_project(VERSION_SUFFIX pre1)
+ign_configure_project(VERSION_SUFFIX)
 
 #============================================================================
 # Set project-specific options

diff --git a/Changelog.md b/Changelog.md
@@ -2,7 +2,15 @@
 
 ## Ignition Math 6.x.x
 
-## Ignition Math 6.9.0 (2021-09-XX)
+## Ignition Math 6.9.1 (2021-09-30)
+
+1. Avoid assertAlmostEqual for python strings
+    * [Pull request #255](https://github.com/ignitionrobotics/ign-math/pull/255)
+
+1. Pose3_TEST.py: use 0.01 (not 0) in string test
+    * [Pull request #257](https://github.com/ignitionrobotics/ign-math/pull/257)
+
+## Ignition Math 6.9.0 (2021-09-28)
 
 1. Volume below a plane for spheres and boxes
     * [Pull request #219](https://github.com/ignitionrobotics/ign-math/pull/219)
@@ -64,6 +72,8 @@
     * [Pull request #209](https://github.com/ignitionrobotics/ign-math/pull/209)
     * [Pull request #227](https://github.com/ignitionrobotics/ign-math/pull/227)
     * [Pull request #225](https://github.com/ignitionrobotics/ign-math/pull/225)
+    * [Pull request #252](https://github.com/ignitionrobotics/ign-math/pull/252)
+    * [Pull request #253](https://github.com/ignitionrobotics/ign-math/pull/253)
 
 ## Ignition Math 6.8.0 (2021-03-30)
 

diff --git a/README.md b/README.md
@@ -64,6 +64,8 @@ ign-math
 ├── include/ignition/math    Header files.
 ├── src                      Source files and unit tests.
 │   └── graph                Source files for the graph classes.
+│   └── python               SWIG Python interfaces.
+│   └── ruby                 SWIG Ruby interfaces.
 ├── eigen3                   Files for Eigen component.
 ├── test
 │    ├── integration         Integration tests.

diff --git a/src/python/Color_TEST.py b/src/python/Color_TEST.py
@@ -296,7 +296,7 @@ def test_const_set(self):
 
     def test_stream_out(self):
         c = Color(0.1, 0.2, 0.3, 0.5)
-        self.assertAlmostEqual(str(c), "0.1 0.2 0.3 0.5")
+        self.assertEqual(str(c), "0.1 0.2 0.3 0.5")
 
     def test_HSV(self):
         clr = Color()

diff --git a/src/python/Pose3_TEST.py b/src/python/Pose3_TEST.py
@@ -141,8 +141,8 @@ def test_pose_atributes(self):
         self.assertTrue(pose.rot() == Quaterniond(1, 0, 0))
 
     def test_stream_out(self):
-        p = Pose3d(0.1, 1.2, 2.3, 0.0, 0.1, 1.0)
-        self.assertAlmostEqual(str(p), "0.1 1.2 2.3 0 0.1 1")
+        p = Pose3d(0.1, 1.2, 2.3, 0.01, 0.1, 1.0)
+        self.assertEqual(str(p), "0.1 1.2 2.3 0.01 0.1 1")
 
     def test_mutable_pose(self):
         pose = Pose3d(0, 1, 2, 0, 0, 0)