Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Os39 #494

Merged
merged 29 commits into from
Jan 29, 2025
Merged

Os39 #494

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
213b8b1
use os3.9 rc3 image in CI, and minor CI cleanups
vtnate Nov 13, 2024
29ceaa1
bump to version 0.14.0
vtnate Nov 13, 2024
8ee628b
use os39 branches for testing
vtnate Nov 13, 2024
f94f762
point example_files Gemfile to new branches
vtnate Nov 14, 2024
4a8d20e
cleanup dependencies
kflemin Jan 13, 2025
53946a6
Merge branch 'develop' into os39
vtnate Jan 14, 2025
1bef4b8
copy files from example-project repo, and update gemfile
vtnate Jan 14, 2025
99a0d5b
point to extension-gem & core during testing
vtnate Jan 15, 2025
9b8b3d6
update python dependency versions
vtnate Jan 15, 2025
e2ff145
Revert "copy files from example-project repo, and update gemfile"
vtnate Jan 15, 2025
10fe4ad
update example_files/Gemfile properly
vtnate Jan 15, 2025
98060e4
tell example_files/Gemfile to use Ruby 3.2.2
vtnate Jan 15, 2025
f6f859a
second try copying from example-project repo
vtnate Jan 15, 2025
a1a98be
add measures dir when creating every project dir now
vtnate Jan 15, 2025
1a43f20
bump to version 1.0.0
vtnate Jan 15, 2025
041e418
use real os39 image in CI
vtnate Jan 15, 2025
f486ca5
add .coverage to gitignore
vtnate Jan 16, 2025
2d35abf
clean up unused variables in spec file
vtnate Jan 16, 2025
f13dd19
address a couple rubocop issues
vtnate Jan 16, 2025
a16c9c7
new test geojson with shortened begin/end dates
vtnate Jan 22, 2025
7b6a8bb
update base workflow to default to whole year run period
vtnate Jan 22, 2025
b6f99ae
use geojson with shorter run period for tests
vtnate Jan 22, 2025
20acd2b
new test geojson files with shorter run periods
vtnate Jan 23, 2025
eb248c8
use new test geojson files in tests
vtnate Jan 23, 2025
46566d3
use released gems, woohoo!
vtnate Jan 27, 2025
ab58436
fix typos from changing run period during tests
vtnate Jan 28, 2025
7200940
comment results validation test temporarily
vtnate Jan 28, 2025
2080531
pick up newest version of ThermalNetwork
vtnate Jan 29, 2025
e67e115
pick up newest version of GMT
vtnate Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use new test geojson files in tests
vtnate committed Jan 23, 2025
commit eb248c869e376778c08f64414b5276a88a198007
10 changes: 8 additions & 2 deletions spec/uo_cli_spec.rb
Original file line number Diff line number Diff line change
@@ -349,7 +349,7 @@ def select_measures(test_dir, measure_name_list, workflow = 'base_workflow.osw',
system("cp #{example_dir / 'mappers' / 'floorspace_workflow.osw'} #{test_directory / 'mappers' / 'floorspace_workflow.osw'}")
system("cp #{example_dir / 'osm_building' / '7_floorspace.json'} #{test_directory / 'osm_building' / '7_floorspace.json'}")
system("cp #{example_dir / 'osm_building' / '7_floorspace.osm'} #{test_directory / 'osm_building' / '7_floorspace.osm'}")
system("cp #{example_dir / 'example_floorspace_project.json'} #{test_directory / 'example_floorspace_project.json'}")
system("cp #{spec_dir / 'spec_files' / 'test_example_floorspace_project.json'} #{test_directory / 'example_floorspace_project.json'}")
system("cp #{spec_dir / 'spec_files' / 'two_building_floorspace.csv'} #{test_directory / 'two_building_floorspace.csv'}")
expect((test_directory / 'osm_building' / '7_floorspace.osm').exist?).to be true
system("#{call_cli} run --scenario #{test_directory / 'two_building_floorspace.csv'} --feature #{test_directory / 'example_floorspace_project.json'}")
@@ -397,7 +397,7 @@ def select_measures(test_dir, measure_name_list, workflow = 'base_workflow.osw',
it 'successfully runs the rnm workflow', :basic do
# This test requires the 'runs a 2 building scenario using default geometry method' be run first
# copy featurefile in dir
rnm_file = 'example_project_with_streets.json'
rnm_file = 'test_example_project_with_streets.json'
system("cp #{spec_dir / 'spec_files' / rnm_file} #{test_directory / rnm_file}")
# call rnm
test_rnm_file = test_directory / rnm_file
@@ -521,8 +521,12 @@ def select_measures(test_dir, measure_name_list, workflow = 'base_workflow.osw',
before :all do
delete_directory_or_file(test_directory)
system("#{call_cli} create --project-folder #{test_directory}")
# Shorter run period during testing
system("cp #{spec_dir / 'spec_files' / 'test_example_project.json'} #{test_feature}")
delete_directory_or_file(test_directory_res)
system("#{call_cli} create --project-folder #{test_directory_res} --combined")
# Shorter run period during testing
system("cp #{spec_dir / 'spec_files' / 'test_example_project_combined.json'} #{test_feature_res}")
end

it 'runs a chilled water scenario with residential and commercial buildings', :GEB do
@@ -614,6 +618,8 @@ def select_measures(test_dir, measure_name_list, workflow = 'base_workflow.osw',
system("#{call_cli} create --project-folder #{test_directory_res} --combined")
delete_directory_or_file(test_directory_res_hpxml)
system("#{call_cli} create --project-folder #{test_directory_res_hpxml} --combined")
# Shorter run period during testing
system("cp #{spec_dir / 'spec_files' / 'test_example_project.json'} #{test_feature_res}")
end

it 'runs a 2 building scenario with residential and commercial buildings', :residential do