Merge pull request #814 from openstudiocoalition/develop

PR to create 1.10.0-RC1

Author: jmarrec

.github/workflows/app_build.yml

@@ -207,6 +207,7 @@ jobs:
         ccache --zero-stats || true
 
     - name: "Configure for codesigning"
+      id: codesigning
       if: runner.os == 'macOS'
       run: |
         set -x
@@ -217,7 +218,8 @@ jobs:
         echo "${{ secrets.MACOS_DEVELOPER_ID_INSTALLER_CERTIFICATE_P12_BASE64 }}" | base64 --decode > certificate_installer.p12
 
         # ----- Configure Keychain -----
-        KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+        KEYCHAIN_PATH=$RUNNER_TEMP/app-signing-${{ github.run_id }}.keychain-db
+        echo "KEYCHAIN_PATH=${KEYCHAIN_PATH}" >> $GITHUB_OUTPUT
         security create-keychain -p "${{ secrets.MACOS_KEYCHAIN_PASSWORD }}" $KEYCHAIN_PATH
         # Unlock it for 6 hours
         security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
@@ -502,7 +504,7 @@ jobs:
         set -x
         if [ "$RUNNER_OS" == "macOS" ]; then
           # Avoid "builtin __has_nothrow_assign is deprecated; use __is_nothrow_assignable instead" in boost/1.78 with recent clang
-          conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=Release -c tools.build:cxxflags="['-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']"
+          conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=Release -c tools.build:cxxflags="['-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION', '-Wno-enum-constexpr-conversion']"
         else
           conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=Release
         fi
@@ -681,6 +683,12 @@ jobs:
         /bin/rm OpenStudioApplication-*${{ env.BINARY_EXT }} || true
         ls OpenStudioApplication-* || true
 
+    - name: "Clean up codesigning"
+      if: always() && runner.os == 'macOS'
+      run: |
+        echo "Deleting keychain ${{ steps.codesigning.outputs.KEYCHAIN_PATH }}"
+        security delete-keychain ${{ steps.codesigning.outputs.KEYCHAIN_PATH }} || true
+        rm -f ${{ steps.codesigning.outputs.KEYCHAIN_PATH }}
 
   test_package_macos:
     name: Test Built Package on macOS

.github/workflows/check_osm_versions.yml

@@ -25,6 +25,6 @@ jobs:
       shell: bash
       run: |
         echo "There is a workflow called export_standards_data that you should run first (it's a manual workflow_dispatch workflow)"
-        echo "or run it locally via 'cd developper/ruby && openstudio export_openstudio_standards_libraries.rb'"
+        echo "or run it locally via 'cd developer/ruby && openstudio export_openstudio_standards_libraries.rb'"
         echo ""
-        echo "Then you should use 'openstudio developper/ruby/UpdateOSMVersions.rb' to version translate the rest of the OSM files."
+        echo "Then you should use 'openstudio developer/ruby/UpdateOSMVersions.rb' to version translate the rest of the OSM files."

CMake/install_codesign_script_OpenStudioApp.cmake

@@ -100,9 +100,9 @@ endif()
 
 set(FILES_TO_SIGN
   EnergyPlus/ExpandObjects
-  EnergyPlus/energyplus-24.2.0
+  EnergyPlus/energyplus-25.1.0
   EnergyPlus/energyplus.1
-  EnergyPlus/libenergyplusapi.24.2.0.dylib
+  EnergyPlus/libenergyplusapi.25.1.0.dylib
   EnergyPlus/libintl.8.dylib
   EnergyPlus/libpython3.12.dylib
   Ruby/openstudio.bundle

CMakeLists.txt

@@ -16,7 +16,7 @@ if(CCACHE_PROGRAM)
   set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used")
 endif()
 
-project(OpenStudioApplication VERSION 1.9.0)
+project(OpenStudioApplication VERSION 1.10.0)
 
 # Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake
 if(APPLE)
@@ -272,7 +272,7 @@ endif()
 
 # 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 "")
+set(PROJECT_VERSION_PRERELEASE "rc1")
 
 # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
 set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
@@ -400,6 +400,9 @@ if(UNIX)
   # Note: CMAKE_CXX_STANDARD (with no extensions) already sets -std=c++17 (or std=c++1z).
   if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    # TODO: workaround for #5398, remove when updating boost
+    AddCXXFlagIfSupported(-Wno-enum-constexpr-conversion COMPILER_SUPPORTS_enum_constexpr_conversion) # Clang 16.0+ and Apple Clang 15+ only
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
   endif()
 endif()
 

FindOpenStudioSDK.cmake

@@ -1,12 +1,12 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 9)
+set(OPENSTUDIO_VERSION_MINOR 10)
 set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
 #If this is an official release, leave this "", otherwise put for eg '-rc1'
 set(OPENSTUDIO_VERSION_PRERELEASE "")
 # Enter SHA, always, eg "+79857912c4"
-set(OPENSTUDIO_VERSION_SHA "+c77fbb9569")
+set(OPENSTUDIO_VERSION_SHA "+86d7e215a1")
 
 # Paths where the cmake-downloaded archives will be put
 set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}")
@@ -17,32 +17,32 @@ set(OPENSTUDIO_EXT "tar.gz")
 if(APPLE)
   set(OPENSTUDIO_PLATFORM "Darwin-${ARCH}")
   if(ARCH MATCHES "arm64")
-    set(OPENSTUDIO_EXPECTED_HASH b373b0f23b529f9764464aae13725558)
+    set(OPENSTUDIO_EXPECTED_HASH b412f1cd6ab6747c75dece567291e81e)
   else()
-    set(OPENSTUDIO_EXPECTED_HASH 39c5ae27eeb840472e36b728ab906315)
+    set(OPENSTUDIO_EXPECTED_HASH 00d0321aa6c4ab5a3c36fe2335a07157)
   endif()
 
 elseif(UNIX)
   set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-${LSB_RELEASE_VERSION_SHORT}-${ARCH}")
   if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04")
     #set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}")
     if (ARCH MATCHES "arm64")
-      set(OPENSTUDIO_EXPECTED_HASH 4c35af3cc4e8d7b1aed2dd98b678a243)
+      set(OPENSTUDIO_EXPECTED_HASH b4f328e0b28a479c55a338e87dac254f)
     else()
-      set(OPENSTUDIO_EXPECTED_HASH 256d18d2d7036883823f2aeae180dfaa)
+      set(OPENSTUDIO_EXPECTED_HASH 92c3407f888731d6da30b0a7b49d0f5c)
     endif()
   elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
     if (ARCH MATCHES "arm64")
-      set(OPENSTUDIO_EXPECTED_HASH fd1ba05628eb55b3bb72923a8395e267)
+      set(OPENSTUDIO_EXPECTED_HASH d1ae86bba822eeb0541a7603e81a4074)
     else()
-      set(OPENSTUDIO_EXPECTED_HASH 67522b9a1ba5749cf0b3cf101a6131cf)
+      set(OPENSTUDIO_EXPECTED_HASH 209820bd2f9b487f0d0f4d4df311753f)
     endif()
   else()
     message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 20.04 or older")
   endif()
 
 elseif(WIN32)
-  set(OPENSTUDIO_EXPECTED_HASH c3a1ec4bc98d7418780a702036ce0edb)
+  set(OPENSTUDIO_EXPECTED_HASH afd101545253e8e7ba17b7b88c0556a2)
   set(OPENSTUDIO_PLATFORM "Windows")
 endif()
 

developer/ruby/export_openstudio_standards_libraries.rb

@@ -84,11 +84,17 @@ def export_openstudio_standards_libraries
     templates = templates - missing_czs
   end
 
+  pkg_dir = "#{__dir__}/pkg"
+  Dir.mkdir(pkg_dir) unless Dir.exist?(pkg_dir)
+  osm_lib_dir = "#{pkg_dir}/libraries"
+  Dir.mkdir(osm_lib_dir) unless Dir.exist?(osm_lib_dir)
+
   # templates = templates_to_climate_zones.keys
   # Make a library model for each template
   # We parallelize this loop, since it takes really long
   # Note: You DO want to use in_processes here, and not in_threads!
   Parallel.each(templates, in_processes: $nproc, progress: 'Exporting openstudio-standards templates') do |template_name|
+  #templates.each do |template_name|
 
     # Wrap each library creation in a begin/rescue because
     # the entire process can take a long time and
@@ -464,10 +470,10 @@ def export_openstudio_standards_libraries
             std_applier.space_type_apply_rendering_color(space_type)
 
             # Loads
-            std_applier.space_type_apply_internal_loads(space_type, true, true, true, true, true, true)
+            std_applier.space_type_apply_internal_loads(space_type, true, true, true, true, true)
 
             # Schedules
-            std_applier.space_type_apply_internal_load_schedules(space_type, true, true, true, true, true, true, true)
+            std_applier.space_type_apply_internal_load_schedules(space_type, true, true, true, true, true, true)
 
           end
         end
@@ -505,10 +511,6 @@ def export_openstudio_standards_libraries
       end
 
       # Save the library
-      pkg_dir = "#{__dir__}/pkg"
-      Dir.mkdir(pkg_dir) unless Dir.exists?(pkg_dir)
-      osm_lib_dir = "#{pkg_dir}/libraries"
-      Dir.mkdir(osm_lib_dir) unless Dir.exists?(osm_lib_dir)
       library_path = "#{osm_lib_dir}/#{template_name.gsub(/\W/,'_')}.osm"
       puts "* Saving library #{library_path}"
       model.save(OpenStudio::Path.new(library_path), true)
@@ -526,7 +528,7 @@ def export_openstudio_standards_libraries
     rescue Exception => exc
       STDERR.puts "\e[0;31;49mERROR creating '#{template_name}', skipping to next template.\e[0m"
       STDERR.puts "#{exc}"
-      STDERR.puts "Backtrace:\n\t#{exc.caller.join("\n\t")}"
+      #STDERR.puts "Backtrace:\n\t#{exc.caller.join("\n\t")}"
       STDERR.puts "Backtrace:\n\t#{exc.backtrace.join("\n\t")}"
 
       # Save the log messages for debugging library creation even on failure

signatures/version1/cla.json

@@ -79,6 +79,14 @@
       "created_at": "2024-05-08T05:25:34Z",
       "repoId": 174587908,
       "pullRequestNo": 713
+    },
+    {
+      "name": "antonszilasi",
+      "id": 8773483,
+      "comment_id": 2689617806,
+      "created_at": "2025-02-28T03:13:26Z",
+      "repoId": 174587908,
+      "pullRequestNo": 791
     }
   ]
 }