Merge pull request #210 from Esri/develop

Release 1.10
Esri · Jul 18, 2024 · ef22cf1 · ef22cf1
2 parents 57340e1 + c516675
commit ef22cf1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # PyPRT ChangeLog
 
+## v1.10.0 (2024-07-17)
+
+### Added
+* Added support for Rule Packages (RPK) created with CityEngine 2024.0
+
+### Changed
+* Updated to [PRT 3.2.10211](https://github.com/Esri/cityengine-sdk/blob/3.2.10211/changelog.md#cityengine-sdk-3210211-changelog)
+* Updated unit tests for PRT bug fix and adapted to behavior changes (see `readStringTable` and `convexify` in changelog).
+
 ## v1.9.0 (2024-07-17)
 
 ### Changed

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.9.0.0
+1.10.0.0
diff --git a/src/cpp/dependencies.properties b/src/cpp/dependencies.properties
@@ -1,4 +1,4 @@
-PRT_VERSION=3.2.9903
+PRT_VERSION=3.2.10211
 PRT_CLS_WINDOWS=win10-vc1437-x86_64-rel-opt
 PRT_CLS_LINUX=rhel8-gcc112-x86_64-rel-opt
 PYBIND11_VERSION=2.11.1
diff --git a/tests/otherExporter_test.py b/tests/otherExporter_test.py
@@ -14,7 +14,6 @@
 # A copy of the license is available in the repository's LICENSE file.
 
 import os
-import sys
 import unittest
 
 import pyprt
@@ -32,9 +31,6 @@ def asset_output_file(filename):
 
 class ExporterTest(unittest.TestCase):
     def test_slpk(self):
-        if sys.platform == "linux" and pyprt.get_api_version()[2] >= 9666:
-            self.fail("explicit fail to prevent crash introduced with PRT 3.1.9666")
-
         if os.path.isfile(asset_output_file('Unittest4SLPK.slpk')):
             os.remove(asset_output_file('Unittest4SLPK.slpk'))
 

diff --git a/tests/pyGeometry_test.py b/tests/pyGeometry_test.py
@@ -14,7 +14,6 @@
 # A copy of the license is available in the repository's LICENSE file.
 
 import os
-import sys
 import unittest
 
 import pyprt
@@ -39,7 +38,7 @@ def test_verticesnumber_candler(self):
         m = pyprt.ModelGenerator([shape_geo_from_obj])
         model = m.generate_model([attrs], rpk, 'com.esri.pyprt.PyEncoder', {
                                  'emitReport': False, 'emitGeometry': True})
-        self.assertEqual(len(model[0].get_vertices()), 97044*3)
+        self.assertEqual(len(model[0].get_vertices()), 97072*3)
 
     def test_facesnumber_candler(self):
         rpk = asset_file('candler.rpk')
@@ -49,7 +48,7 @@ def test_facesnumber_candler(self):
         m = pyprt.ModelGenerator([shape_geo_from_obj])
         model = m.generate_model([attrs], rpk, 'com.esri.pyprt.PyEncoder', {
                                  'emitReport': False, 'emitGeometry': True})
-        self.assertEqual(len(model[0].get_faces()), 47202)
+        self.assertEqual(len(model[0].get_faces()), 47208)
 
     def test_facesnumber_triangulation(self):
         rpk = asset_file('extrusion_rule.rpk')
@@ -62,9 +61,6 @@ def test_facesnumber_triangulation(self):
         self.assertEqual(len(model[0].get_faces()), 28)
 
     def test_report_green(self):
-        if sys.platform == "linux" and pyprt.get_api_version()[2] >= 9666:
-            self.fail("explicit fail to prevent crash introduced with PRT 3.1.9666")
-
         rpk = asset_file('envelope2002.rpk')
         attrs = {'report_but_not_display_green': True, 'seed': 666}
         shape_geo_from_obj = pyprt.InitialShape(
@@ -175,9 +171,6 @@ def test_initial_shape_with_hole(self):
             self.assertEqual(cga_print, expected_content)
 
     def test_cga_prints_green(self):
-        if sys.platform == "linux" and pyprt.get_api_version()[2] >= 9666:
-            self.fail("explicit fail to prevent crash introduced with PRT 3.1.9666")
-
         rpk = asset_file('envelope2002.rpk')
         attrs = {'report_but_not_display_green': True, 'seed': 2}
         shape_geo_from_obj = pyprt.InitialShape(