3.8.0 rc2 (#5186)

* Update the os-gems to 380 rc2 with dependencies released. * Update openstudio gems and embed into openstudio sdk * Update the os-gems for skipping json * Adjust the json test to actually check the version we get --------- Co-authored-by: Julien Marrec <[email protected]>
NREL · May 7, 2024 · 06d9d97 · 06d9d97
1 parent d671778
commit 06d9d97
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,7 +161,7 @@ get_directory_property(hasParent PARENT_DIRECTORY)
 
 # TODO: Modify the more specific variables as needed to indicate prerelease, etc
 # Keep in beta in-between release cycles. Set to empty string (or comment out) for official)
-set(PROJECT_VERSION_PRERELEASE "rc1")
+set(PROJECT_VERSION_PRERELEASE "rc2")
 
 # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
 set(OPENSTUDIO_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
@@ -839,7 +839,7 @@ if(BUILD_CLI)
   set(OPENSTUDIO_GEMS_BASEURL "http://openstudio-resources.s3.amazonaws.com/dependencies")
 
   # TODO: temp
-  set(OPENSTUDIO_GEMS_BASEURL "https://github.com/NREL/openstudio-gems/releases/download/v3.8.0-RC1-6")
+  set(OPENSTUDIO_GEMS_BASEURL "https://github.com/NREL/openstudio-gems/releases/download/v3.8.0-RC2-4")
 
   # To use the package produced by a PR to https://github.com/NREL/openstudio-gems
   set(USE_OPENSTUDIO_GEMS_PR FALSE)
@@ -851,28 +851,28 @@ if(BUILD_CLI)
   if(UNIX)
      if(APPLE)
        if (ARCH MATCHES arm64)
-         set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240425-darwin_arm64-3.2.2.tar.gz")
-         set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "b71347bdc4ab8cc61fa4c9c58efc0617")
+         set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240506-darwin_arm64-3.2.2.tar.gz")
+         set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "d52a2508b1612162f07c9fcbe02004d8")
        else()
-         set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240425-darwin-3.2.2.tar.gz")
-         set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "20bef19c70469dfdcc5a739131a66424")
+         set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240506-darwin-3.2.2.tar.gz")
+         set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "0e16bad0da61b2f62a9e49c37c2c115f")
        endif()
      else()
        if (ARCH MATCHES "arm64")
          set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240425-linux_arm64-3.2.2.tar.gz")
          set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "a56cff9faaa3122cf659969223c89205")
        else()
-         set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240425-linux-3.2.2.tar.gz")
-         set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "f36bbd761b9eb39eb7e774bd50a16ec4")
+         set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240506-linux-3.2.2.tar.gz")
+         set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "c32d687e7e94c29b99489ad479b83f23")
        endif()
        if (USE_OPENSTUDIO_GEMS_PR)
          set(OPENSTUDIO_GEMS_BASEURL "${OPENSTUDIO_GEMS_BASEURL}/openstudio-gems-linux/${OPENSTUDIO_GEMS_PR_NUMBER}")
        endif()
      endif()
   elseif(WIN32)
     # OpenStudio gems are only supported on 64 bit windows
-    set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240425-windows-3.2.2.tar.gz")
-    set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "fe8c5396642ea9cbf92d40cff0dbafbe")
+    set(OPENSTUDIO_GEMS_ZIP_FILENAME "openstudio3-gems-20240506-windows-3.2.2.tar.gz")
+    set(OPENSTUDIO_GEMS_ZIP_EXPECTED_MD5 "b21a45c3d81e31d8add5fc5d6d2fa5bd")
     if (USE_OPENSTUDIO_GEMS_PR)
       set(OPENSTUDIO_GEMS_BASEURL "${OPENSTUDIO_GEMS_BASEURL}/openstudio-gems-windows/${OPENSTUDIO_GEMS_PR_NUMBER}")
     endif()

diff --git a/ruby/engine/embedded_help.rb b/ruby/engine/embedded_help.rb
@@ -128,8 +128,10 @@ module Kernel
     'liboga' => 'init_liboga',\
     'sqlite3/sqlite3_native' => 'init_sqlite3_native',\
     'jaro_winkler_ext' => 'init_jaro_winkler_ext',\
-    'msgpack/msgpack' => 'init_msgpack',
-    'byebug/byebug' => 'init_byebug'
+    'msgpack/msgpack' => 'init_msgpack',\
+    'byebug/byebug' => 'init_byebug',\
+    'json/ext/parser' => 'init_parser',\
+    'json/ext/generator' => 'init_generator'
     #'cbor/cbor' => 'init_cbor',\
   }
 

diff --git a/src/cli/test/test_embedded_ruby.rb b/src/cli/test/test_embedded_ruby.rb
@@ -90,6 +90,9 @@ def test_json
     require 'json'
     my_hash = JSON.parse('{"hello": "goodbye"}')
     JSON.generate(my_hash)
+    assert_equal(JSON.parser, JSON::Ext::Parser)
+    assert_equal(JSON.generator, JSON::Ext::Generator)
+    assert_equal("2.6.3", JSON::VERSION)
   end
 
   def test_md5