From 5f74c4e123e0cbcec9c976e83d84a3c587f24ed8 Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Fri, 12 Jul 2024 10:31:36 +0200 Subject: [PATCH 1/6] Start dev cycle for 1.10 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 36497cb4..a4eb7285 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.0.0 \ No newline at end of file +1.10.0.0.dev0 \ No newline at end of file From c27d6f1c18cbf9cb6fef1906a55d0ad4b62a5c7b Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Fri, 12 Jul 2024 10:32:28 +0200 Subject: [PATCH 2/6] Switch to PRT 3.2.10211 --- src/cpp/dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp/dependencies.properties b/src/cpp/dependencies.properties index 54457c9e..a71ad39d 100644 --- 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 \ No newline at end of file From ed6607a645a46c8532a1599ae57fcf0411121680 Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Fri, 12 Jul 2024 11:27:36 +0200 Subject: [PATCH 3/6] Revert "explicitly fail tests which crash on Linux with PRT 3.1.9666" This reverts commit ca3927a4abd6ec269494596431234746fa801b98. --- tests/otherExporter_test.py | 4 ---- tests/pyGeometry_test.py | 7 ------- 2 files changed, 11 deletions(-) diff --git a/tests/otherExporter_test.py b/tests/otherExporter_test.py index 269802ed..1b1bcfc3 100644 --- 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 index 19e78e69..60392c04 100644 --- 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 @@ -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( From c6ce1bf616ac4af943861d36280ccf3e34f1a348 Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Fri, 12 Jul 2024 11:57:18 +0200 Subject: [PATCH 4/6] Adapt test assertion to changed PRT behavior (convexify, offset) --- tests/pyGeometry_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pyGeometry_test.py b/tests/pyGeometry_test.py index 60392c04..543fe274 100644 --- a/tests/pyGeometry_test.py +++ b/tests/pyGeometry_test.py @@ -38,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') @@ -48,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') From 1ba20b7b98faf7d5b872b0295b890ce9bbeeaf76 Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Fri, 12 Jul 2024 12:24:14 +0200 Subject: [PATCH 5/6] doc: updated changelog for 1.10.0 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6432806..45272a4b 100644 --- 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 From c516675c527f0e29af5eb0b8fc480dc57c8556ab Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Thu, 18 Jul 2024 13:47:01 +0200 Subject: [PATCH 6/6] Switch to 1.10 release version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a4eb7285..d1872399 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.0.0.dev0 \ No newline at end of file +1.10.0.0 \ No newline at end of file