urbanopt-cli 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/CMakeLists.txt +23 -23
  4. data/FindOpenStudioSDK.cmake +7 -7
  5. data/example_files/Gemfile +7 -7
  6. data/lib/uo_cli/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 931758f051eca09e7256fc5bfab130605c65c27307a3cdc77042a263e5475609
4
- data.tar.gz: f575bb0873e33c4ee5d76f44cb87fd0bc2ed5d9987902f0f9d5a9277a53a023d
3
+ metadata.gz: cdbb8ccb8a831bc0fd662c5a4cbcdf4fba8ac395fc783f43a6d6e1e828564b15
4
+ data.tar.gz: fb06db3924a64118be767d68fa3d336d573f6219cc69ffd6b6d4ec31f0a9c58e
5
5
  SHA512:
6
- metadata.gz: 5391d6de75b610895fee3099b0913ceef87e3346e6e590ce618f360decdf250f7757cac4812cc7517c80140cc45b2575c58bef723ac91e4154cd8f40728d6246
7
- data.tar.gz: 7e7a75284562d80ee26bf9b378f0bbe7746e4ea0c0e7c7345acc099efe1001a90a31e60a0c5afb9c10f034cf399318d36f819f2b7b777a855e8a871b6d7fd36f
6
+ metadata.gz: 38cf1540424ff83123ad91ca852939c2a232d9d2de822fd391050f6d24d769a1b496a32427fe3202c9fd1c4e133e55ff6c0ff8b2155b53c4de5aadbcb8e3f0d8
7
+ data.tar.gz: 89c70836f3f3516cd2e59af1ec87d75d456700f60d6da9e8b23a8fe5394065fdc6bf6972041b84a5a849f378d583efe8ac863d7b137ace49da3ee15e3e7d4aca
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## Versuib 0.7.1
4
+
5
+ Date Range 11/23/21 - 12/22/21
6
+
7
+ - Bugfix: update project gemfile dependencies
8
+
3
9
  ## Version 0.7.0
4
10
 
5
11
  Date Range 11/4/21 - 11/22/21
data/CMakeLists.txt CHANGED
@@ -1,7 +1,7 @@
1
1
  cmake_minimum_required(VERSION 3.10.2)
2
2
  cmake_policy(SET CMP0048 NEW)
3
3
 
4
- project(UrbanOptCLI VERSION 0.6.4)
4
+ project(URBANoptCLI VERSION 0.7.0)
5
5
 
6
6
  include(FindOpenStudioSDK.cmake)
7
7
 
@@ -56,7 +56,7 @@ else()
56
56
  set(GIT_DIR "")
57
57
  endif()
58
58
 
59
- # UrbanOpt version: Allows to add a pre1 tag as needed.
59
+ # URBANopt version: Allows to add a pre1 tag as needed.
60
60
  set(URBANOPT_CLI_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
61
61
  # TODO JM 2019-07-12: Comment out (or delete) if prerelease tag not needed
62
62
  set(URBANOPT_CLI_PRERELEASE_TAG "")
@@ -89,16 +89,16 @@ option(BUILD_PACKAGE "Build package" OFF)
89
89
  # need to update the MD5sum for each platform and url below
90
90
  if(UNIX)
91
91
  if(APPLE)
92
- set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-darwin.tar.gz")
93
- set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "3eeb7ef73b990b74b714650dbd291413")
92
+ set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems=20211217-darwin.tar.gz")
93
+ set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "013879063606d24ccb163304042d704c")
94
94
  else()
95
- set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-linux.tar.gz")
96
- set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "63bf2adfd5812252de77f6b35e43c09f")
95
+ set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211217-linux.tar.gz")
96
+ set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "25ee39a3ac39c2354eea28194679aea3")
97
97
  endif()
98
98
  elseif(WIN32)
99
99
  if(CMAKE_CL_64)
100
- set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-windows.tar.gz")
101
- set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ea3a4d32bf39964c1b374efa1ca6ca18")
100
+ set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211217-windows.tar.gz")
101
+ set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "f5a2e6e9d1861c79b7c9de924da2e316")
102
102
  endif()
103
103
  endif()
104
104
 
@@ -109,7 +109,7 @@ if(EXISTS "${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}")
109
109
  endif()
110
110
 
111
111
  if(NOT URBANOPT_CLI_GEMS_ZIP_MD5 STREQUAL URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5)
112
- message(STATUS "Downloading UrbanOpt-CLI Gems: ${URBANOPT_CLI_GEMS_ZIP_FILENAME}")
112
+ message(STATUS "Downloading URBANopt-CLI Gems: ${URBANOPT_CLI_GEMS_ZIP_FILENAME}")
113
113
  file(DOWNLOAD "https://urbanopt-cli-resources.s3-us-west-2.amazonaws.com/gems/${URBANOPT_CLI_GEMS_ZIP_FILENAME}"
114
114
  ${URBANOPT_CLI_GEMS_ZIP_LOCAL_PATH}
115
115
  INACTIVITY_TIMEOUT 300 # 5 minute timeout
@@ -164,19 +164,19 @@ endif()
164
164
  ######### Install SDK dependencies here ################
165
165
 
166
166
  install(DIRECTORY "${OPENSTUDIO_SDK_PATH}/" DESTINATION "OpenStudio" COMPONENT "OpenStudio" USE_SOURCE_PERMISSIONS)
167
- #install(DIRECTORY "${URBANOPT_CLI_GEMS_DIR}/" DESTINATION ".gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
167
+ #install(DIRECTORY "${URBANOPT_CLI_GEMS_DIR}/" DESTINATION ".gems" COMPONENT "URBANopt" USE_SOURCE_PERMISSIONS)
168
168
 
169
169
 
170
170
  if(UNIX)
171
- install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-unix.sh DESTINATION "." COMPONENT "UrbanOpt" RENAME "setup-env.sh")
171
+ install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-unix.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
172
172
  elseif(WIN32)
173
- install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "UrbanOpt" RENAME "setup-env.sh")
174
- install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "UrbanOpt")
175
- install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "UrbanOpt")
173
+ install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
174
+ install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "URBANopt")
175
+ install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "URBANopt")
176
176
  endif()
177
177
 
178
178
  install(DIRECTORY "${PROJECT_BINARY_DIR}/ruby" DESTINATION "." COMPONENT "Ruby" USE_SOURCE_PERMISSIONS)
179
- install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt-cli-gems/" DESTINATION "gems" COMPONENT "UrbanOpt" USE_SOURCE_PERMISSIONS)
179
+ install(DIRECTORY "${PROJECT_BINARY_DIR}/urbanopt-cli-gems/" DESTINATION "gems" COMPONENT "URBANopt" USE_SOURCE_PERMISSIONS)
180
180
 
181
181
  #if(WIN32)
182
182
  # install(PROGRAMS "${OPENSTUDIO_SDK_PATH}/bin/install_utility.exe" DESTINATION bin COMPONENT "CLI")
@@ -193,7 +193,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${URBANOPT_CLI_VERSION_PATCH})
193
193
 
194
194
  # TODO:/URBANOPT_CLI_VERSION
195
195
  # CPACK_DEBIAN_PACKAGE_DESCRIPTION defaults to this one too. dpkg-deb -I xxx.deb will show this description
196
- set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "UrbanOptCLI ${URBANOPT_CLI_VERSION} is a CLI software tool to support whole building energy modeling using EnergyPlus and advanced daylight analysis using Radiance")
196
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "URBANoptCLI ${URBANOPT_CLI_VERSION} is a CLI software tool to support whole building energy modeling using EnergyPlus and advanced daylight analysis using Radiance")
197
197
 
198
198
  # The actual package file name on disk
199
199
  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${URBANOPT_CLI_LONG_VERSION}-${CMAKE_SYSTEM_NAME}")
@@ -203,8 +203,8 @@ set(CPACK_PACKAGE_CONTACT "openstudio@nrel.gov")
203
203
  #install(FILES "${PROJECT_SOURCE_DIR}/LICENSE.md" DESTINATION .)
204
204
 
205
205
  if (APPLE)
206
- #set(CPACK_IFW_TARGET_DIRECTORY "/Applications/UrbanOpt-cli-${URBANOPT_CLI_VERSION}")
207
- set(CPACK_IFW_TARGET_DIRECTORY "/Applications/UrbanOptCLI_${URBANOPT_CLI_VERSION}/")
206
+ #set(CPACK_IFW_TARGET_DIRECTORY "/Applications/URBANopt-cli-${URBANOPT_CLI_VERSION}")
207
+ set(CPACK_IFW_TARGET_DIRECTORY "/Applications/URBANoptCLI_${URBANOPT_CLI_VERSION}/")
208
208
  elseif(UNIX)
209
209
 
210
210
  # For debug
@@ -235,7 +235,7 @@ elseif(UNIX)
235
235
  set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CPACK_DEBIAN_BIN_PACKAGE_CONTROL_EXTRA};${POSTINST_FILE};${POSTRM_FILE}")
236
236
 
237
237
  elseif(WIN32)
238
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "UrbanOpt-cli-${URBANOPT_CLI_VERSION}")
238
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "URBANopt-cli-${URBANOPT_CLI_VERSION}")
239
239
  set(CPACK_IFW_TARGET_DIRECTORY "C:/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
240
240
  set(CPACK_BINARY_IFW ON CACHE BOOL "Enable to build IFW packages")
241
241
  set(CPACK_BINARY_NSIS OFF CACHE BOOL "Enable to build NSIS packages")
@@ -243,9 +243,9 @@ endif()
243
243
 
244
244
  include(CPackIFW)
245
245
 
246
- cpack_add_component(UrbanOpt
247
- DISPLAY_NAME "UrbanOpt CLI"
248
- DESCRIPTION "UrbanOpt CLI software tool"
246
+ cpack_add_component(URBANopt
247
+ DISPLAY_NAME "URBANopt CLI"
248
+ DESCRIPTION "URBANopt CLI software tool"
249
249
  )
250
250
 
251
251
  cpack_add_component(OpenStudio
@@ -253,7 +253,7 @@ cpack_add_component(OpenStudio
253
253
  DESCRIPTION "OpenStudio SDK"
254
254
  )
255
255
 
256
- cpack_ifw_configure_component(UrbanOpt
256
+ cpack_ifw_configure_component(URBANopt
257
257
  REQUIRES_ADMIN_RIGHTS
258
258
  )
259
259
 
data/FindOpenStudioSDK.cmake CHANGED
@@ -1,6 +1,6 @@
1
1
  set(OPENSTUDIO_VERSION_MAJOR 3)
2
- set(OPENSTUDIO_VERSION_MINOR 2)
3
- set(OPENSTUDIO_VERSION_PATCH 1)
2
+ set(OPENSTUDIO_VERSION_MINOR 3)
3
+ set(OPENSTUDIO_VERSION_PATCH 0)
4
4
  set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
5
5
 
6
6
  find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG)
@@ -16,23 +16,23 @@ else()
16
16
  set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
17
17
  CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
18
18
 
19
- set(OPENSTUDIO_VERSION_SHA "+bdbdbc9da6")
19
+ set(OPENSTUDIO_VERSION_SHA "+ad235ff36e")
20
20
 
21
21
  if(APPLE)
22
- set(OPENSTUDIO_EXPECTED_HASH 5733364813912cb5256fb338faa82e47)
22
+ set(OPENSTUDIO_EXPECTED_HASH 77c2bf77f07dc2e2af7658df55940c49)
23
23
  set(OPENSTUDIO_PLATFORM "Darwin")
24
24
  set(OPENSTUDIO_EXT "tar.gz")
25
25
  elseif(UNIX)
26
26
  if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
27
- set(OPENSTUDIO_EXPECTED_HASH dce4f2eff5985d94255a1a49bc3aa97f)
27
+ set(OPENSTUDIO_EXPECTED_HASH 7fca6ef73399fdb21cde01aca4223d7c)
28
28
  set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
29
29
  else() # Assumes 18.04
30
- set(OPENSTUDIO_EXPECTED_HASH 521802b1176ba7cd4a2ed4a94a347484)
30
+ set(OPENSTUDIO_EXPECTED_HASH 24858ac666a3d2fc40d0cff7b4f444b9)
31
31
  set(OPENSTUDIO_PLATFORM "Ubuntu-18.04")
32
32
  endif()
33
33
  set(OPENSTUDIO_EXT "tar.gz")
34
34
  elseif(WIN32)
35
- set(OPENSTUDIO_EXPECTED_HASH 0ab2fdc4de81bd268732ffca6cb50a61)
35
+ set(OPENSTUDIO_EXPECTED_HASH f01ddb50a7ce1f4461e1919350e7c629)
36
36
  set(OPENSTUDIO_PLATFORM "Windows")
37
37
  set(OPENSTUDIO_EXT "tar.gz")
38
38
  endif()
data/example_files/Gemfile CHANGED
@@ -31,7 +31,7 @@ if allow_local && File.exist?('../openstudio-common-measures-gem')
31
31
  elsif allow_local
32
32
  gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
33
33
  else
34
- gem 'openstudio-common-measures', '~> 0.4.0'
34
+ gem 'openstudio-common-measures', '~> 0.5.0'
35
35
  end
36
36
 
37
37
  if allow_local && File.exist?('../openstudio-model-articulation-gem')
@@ -39,7 +39,7 @@ if allow_local && File.exist?('../openstudio-model-articulation-gem')
39
39
  elsif allow_local
40
40
  gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
41
41
  else
42
- gem 'openstudio-model-articulation', '~> 0.4.0'
42
+ gem 'openstudio-model-articulation', '~> 0.5.0'
43
43
  end
44
44
 
45
45
  if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
@@ -47,7 +47,7 @@ if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
47
47
  elsif allow_local
48
48
  gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master'
49
49
  else
50
- gem 'openstudio-load-flexibility-measures', '~> 0.3.2'
50
+ gem 'openstudio-load-flexibility-measures', '~> 0.4.0'
51
51
  end
52
52
 
53
53
  if allow_local && File.exist?('../openstudio-ee-gem')
@@ -55,7 +55,7 @@ if allow_local && File.exist?('../openstudio-ee-gem')
55
55
  elsif allow_local
56
56
  gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop'
57
57
  else
58
- gem 'openstudio-ee', '~> 0.4.0'
58
+ gem 'openstudio-ee', '~> 0.5.0'
59
59
  end
60
60
 
61
61
  if allow_local && File.exist?('../openstudio-calibration-gem')
@@ -63,7 +63,7 @@ if allow_local && File.exist?('../openstudio-calibration-gem')
63
63
  elsif allow_local
64
64
  gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop'
65
65
  else
66
- gem 'openstudio-calibration', '~> 0.4.0'
66
+ gem 'openstudio-calibration', '~> 0.5.0'
67
67
  end
68
68
 
69
69
  if allow_local && File.exists?('../urbanopt-geojson-gem')
@@ -71,7 +71,7 @@ if allow_local && File.exists?('../urbanopt-geojson-gem')
71
71
  elsif allow_local
72
72
  gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
73
73
  else
74
- gem 'urbanopt-geojson', '~> 0.6.6'
74
+ gem 'urbanopt-geojson', '~> 0.7.0'
75
75
  end
76
76
 
77
77
  # NEVER put SCENARIO-GEM in this file...it will make all simulations fail due to the sqlite dependency
@@ -82,5 +82,5 @@ if allow_local && File.exists?('../urbanopt-reporting-gem')
82
82
  elsif allow_local
83
83
  gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
84
84
  else
85
- gem 'urbanopt-reporting', '~> 0.4.2'
85
+ gem 'urbanopt-reporting', '~> 0.5.0'
86
86
  end
data/lib/uo_cli/version.rb CHANGED
@@ -40,6 +40,6 @@
40
40
 
41
41
  module URBANopt
42
42
  module CLI
43
- VERSION = '0.7.0'.freeze
43
+ VERSION = '0.7.1'.freeze
44
44
  end
45
45
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: urbanopt-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Moore
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-13 00:00:00.000000000 Z
11
+ date: 2021-12-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: optimist