urbanopt-cli 0.8.1 → 0.8.3

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 (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +12 -0
  3. data/CMakeLists.txt +7 -7
  4. data/example_files/mappers/Baseline.rb +1 -1
  5. data/lib/uo_cli/version.rb +1 -1
  6. data/lib/uo_cli.rb +5 -5
  7. data/scripts/setup-env.bat +6 -7
  8. data/uo_cli.gemspec +1 -1
  9. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2cfc76f36d83740edb23d5467b70a0f91f705b92b9e4404b0b4040291680a723
4
- data.tar.gz: 8f0775b5b8a3342cc4a59e0644dfbbaf0da3ca3f769cacdbb793d18f61c0f061
3
+ metadata.gz: a33750f7c6d4a272f98b1965ac605a17349f2c31235dac2d539dbd0958844cfc
4
+ data.tar.gz: 3107b8c5a949a7b2ef9e9cf2da3155ca4dd36a2af04006dc9edaecd1daf8360b
5
5
  SHA512:
6
- metadata.gz: 5c095dbcdfd3515663dfa8dc521ca1905ff33d19b1289d9eb869b9cce7d21e21c037c1d22dc464f4b35c2e75427910fd2640e5f89deef7991629156102990823
7
- data.tar.gz: ddfa5de59cc47cedf5226bdfa1b5d5090ab49328faec6e79f757fcb267bd9fdc358dfa4ece1e1a82dca87bfd07b7b8ff92700fd749c1e39e613dc6eb733586f3
6
+ metadata.gz: 8e4fd980a5075d636e26dc758bd184d53357b8d54505a1d23991237606129fd48d4435f4b619cb3f9fa793bc0296b0cc48e19775ff99a1bc8b1d4124296ae764
7
+ data.tar.gz: ab483f7b04979ff2cb2fb34766fbda90f8ffacc014e1bb450f1d5ef048cba0464b3abe09646307b3fc626fc66f520888e7f846e0e8f232c0c151b2e6763a7197
data/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # Changelog
2
2
 
3
+ ## Version 0.8.3
4
+ Date Range: 07/07/22 - 09/30/22:
5
+
6
+ - Updated RNM-US gem dependency to 0.4.0 (API v2)
7
+ - Fixed [#368]( https://github.com/urbanopt/urbanopt-cli/issues/368 ), Num-parallel flag leads to crash
8
+ - Fixed [#375]( https://github.com/urbanopt/urbanopt-cli/issues/375 ), Windows Installer setup script doesn't work for usernames with spaces
9
+
10
+ ## Version 0.8.2
11
+ Date Range: 06/28/22 - 07/06/22:
12
+
13
+ - Fixed [#362]( https://github.com/urbanopt/urbanopt-cli/issues/362 ), BuildResidentialModel measure can't handle non-integer feature IDs
14
+
3
15
  ## Version 0.8.1
4
16
  Date Range: 05/14/22 - 06/28/22:
5
17
 
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.8.0)
4
+ project(URBANoptCLI VERSION 0.8.2)
5
5
 
6
6
  include(FindOpenStudioSDK.cmake)
7
7
 
@@ -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-20220520-darwin.tar.gz")
93
- set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "9dea01c3a9664818a15ad34a5d37a155")
92
+ set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20220711-darwin.tar.gz")
93
+ set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bcc9c16f0736838727050564a55b3806")
94
94
  else()
95
- set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20220520-linux.tar.gz")
96
- set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "84678cac20979c63913c8e4f99f30e0e")
95
+ set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20220711-linux.tar.gz")
96
+ set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6b6054e9d9bf6efecfc4054158f685b6")
97
97
  endif()
98
98
  elseif(WIN32)
99
99
  if(CMAKE_CL_64)
100
- set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20220520-windows.tar.gz")
101
- set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "e31a7f7c12bde79046e18f9d2a23f105")
100
+ set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20220711-windows.tar.gz")
101
+ set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "7d1b2cd1d97c177885d41ef07c856e1d")
102
102
  endif()
103
103
  endif()
104
104
 
data/example_files/mappers/Baseline.rb CHANGED
@@ -810,7 +810,7 @@ module URBANopt
810
810
  feature_ids << feature.id
811
811
  end
812
812
 
813
- args[:feature_id] = feature_id
813
+ args[:feature_id] = feature_ids.index(feature_id)
814
814
  args[:schedules_random_seed] = feature_ids.index(feature_id)
815
815
  args[:schedules_type] = 'stochastic' # smooth or stochastic
816
816
  args[:schedules_variation] = 'unit' # building or unit
data/lib/uo_cli/version.rb CHANGED
@@ -40,6 +40,6 @@
40
40
 
41
41
  module URBANopt
42
42
  module CLI
43
- VERSION = '0.8.1'.freeze
43
+ VERSION = '0.8.3'.freeze
44
44
  end
45
45
  end
data/lib/uo_cli.rb CHANGED
@@ -173,7 +173,7 @@ module URBANopt
173
173
 
174
174
  opt :num_parallel, "\nOPTIONAL: Run URBANopt simulations in parallel using <num_parallel> cores\n" \
175
175
  "Adjusts value of 'num_parallel' in the 'runner.conf' file\n" \
176
- "Example: uo run --num-parallel 2\n", short: :n
176
+ "Example: uo run --num-parallel 2\n", type: Integer, short: :n
177
177
  end
178
178
  end
179
179
 
@@ -821,13 +821,13 @@ module URBANopt
821
821
  if ENV['UO_NUM_PARALLEL'] || @opthash.subopts[:num_parallel]
822
822
  runner_file_path = File.join(@root_dir, 'runner.conf')
823
823
  runner_conf_hash = JSON.parse(File.read(runner_file_path))
824
- if ENV['UO_NUM_PARALLEL']
825
- runner_conf_hash['num_parallel'] = ENV['UO_NUM_PARALLEL'].to_i
824
+ if @opthash.subopts[:num_parallel]
825
+ runner_conf_hash['num_parallel'] = @opthash.subopts[:num_parallel]
826
826
  File.open(runner_file_path, 'w+') do |f|
827
827
  f << runner_conf_hash.to_json
828
828
  end
829
- elsif @opthash.subopts[:num_parallel]
830
- runner_conf_hash['num_parallel'] = @opthash.subopts[:num_parallel].to_i
829
+ elsif ENV['UO_NUM_PARALLEL']
830
+ runner_conf_hash['num_parallel'] = ENV['UO_NUM_PARALLEL'].to_i
831
831
  File.open(runner_file_path, 'w+') do |f|
832
832
  f << runner_conf_hash.to_json
833
833
  end
data/scripts/setup-env.bat CHANGED
@@ -10,13 +10,12 @@ SET RUBYLIB=%BASE_DIR_NAME%\OpenStudio\Ruby
10
10
  SET RUBY_DLL_PATH=%BASE_DIR_NAME%\OpenStudio\Ruby
11
11
 
12
12
  IF EXIST %HOMEPATH%\.env_uo.bat (
13
- del %HOMEPATH%\.env_uo.bat
13
+ del "%HOMEPATH%\.env_uo.bat"
14
14
  )
15
15
 
16
- echo SET GEM_HOME=%GEM_HOME%>> %HOMEPATH%\.env_uo.bat
17
- echo SET GEM_PATH=%GEM_PATH%>> %HOMEPATH%\.env_uo.bat
18
- echo SET PATH=%PATH%>> %HOMEPATH%\.env_uo.bat
19
- echo SET RUBYLIB=%RUBYLIB%>> %HOMEPATH%\.env_uo.bat
20
- echo SET RUBY_DLL_PATH=%RUBY_DLL_PATH%>> %HOMEPATH%\.env_uo.bat
21
-
16
+ echo SET "GEM_HOME=%GEM_HOME%">> "%HOMEPATH%\.env_uo.bat"
17
+ echo SET "GEM_PATH=%GEM_PATH%">> "%HOMEPATH%\.env_uo.bat"
18
+ echo SET "PATH=%PATH%">> "%HOMEPATH%\.env_uo.bat"
19
+ echo SET "RUBYLIB=%RUBYLIB%">> "%HOMEPATH%\.env_uo.bat"
20
+ echo SET "RUBY_DLL_PATH=%RUBY_DLL_PATH%">> "%HOMEPATH%\.env_uo.bat"
22
21
 
data/uo_cli.gemspec CHANGED
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
37
37
  spec.add_runtime_dependency 'urbanopt-geojson', '~> 0.8.1'
38
38
  spec.add_runtime_dependency 'urbanopt-reopt', '~> 0.8.0'
39
39
  spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.6.1'
40
- spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 0.3.0'
40
+ spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 0.4.0'
41
41
  spec.add_runtime_dependency 'urbanopt-scenario', '~> 0.8.0'
42
42
 
43
43
  spec.add_development_dependency 'bundler', '>= 2.1.0'
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.8.1
4
+ version: 0.8.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Moore
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-28 00:00:00.000000000 Z
11
+ date: 2022-10-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: optimist
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.3.0
75
+ version: 0.4.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.3.0
82
+ version: 0.4.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: urbanopt-scenario
85
85
  requirement: !ruby/object:Gem::Requirement