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

Upgrade to OpenStudio 3.8 & Ruby 3.2 #154

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .github/workflows/nightly_ci_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,22 @@ jobs:
weeknight-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
image: docker://nrel/openstudio:3.8.0
steps:
- uses: actions/checkout@v4
- name: set git config options
shell: bash
run: |
git config --global --add safe.directory '*'
run: git config --global --add safe.directory '*'
- name: Update gems
run: |
ruby --version
bundle update
bundle install
- name: List OpenStudio measures
run: bundle exec rake openstudio:list_measures
- name: Update OpenStudio measures
run: bundle exec rake openstudio:update_measures
run: |
bundle install
bundle exec rake openstudio:update_measures
- name: Test OpenStudio measures
run: bundle exec rake openstudio:test_with_openstudio
- name: Run Rspec
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/lib/measures/*/tests/output
out.txt
.rubocop*s3*
.coverage

# rspec failure tracking
.rspec_status
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# URBANopt Reporting Gem

## Version 0.11.0
* Upgrade to OpenStudio 3.8 & Ruby 3.2 by @vtnate in https://github.com/urbanopt/urbanopt-reporting-gem/pull/154

**Full Changelog**: https://github.com/urbanopt/urbanopt-reporting-gem/compare/v0.10.1...v0.11.0

## Version 0.10.1
* Other Fuel emission factors update by @rawadelkontar in https://github.com/urbanopt/urbanopt-reporting-gem/pull/153

Expand Down
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ gemspec
# checkout the latest version (develop) from github.
allow_local = ENV['FAVOR_LOCAL_GEMS']

# pin this dependency to avoid unicode_normalize error
# pin this dependency to avoid unicode_normalize error (openstudio:test_with_openstudio)
gem 'addressable', '2.8.1'
# pin this dependency to avoid using racc dependency (which has native extensions)
gem 'parser', '3.2.2.2'
# gem 'parser', '3.2.2.2'
# pin this dependency because 2.9.2 breaks OS tests (openstudio:test_with_openstudio)
gem 'regexp_parser', '2.9.0'

# if allow_local && File.exist?('../openstudio-extension-gem')
# gem 'openstudio-extension', path: '../openstudio-extension-gem'
# elsif allow_local
# gem 'openstudio-extension', github: 'NREL/openstudio-extension-gem', branch: 'develop'
# gem 'openstudio-extension', github: 'NREL/openstudio-extension-gem', branch: 'develop'
# gem 'openstudio-extension', '~> 0.8.1'
# end
6 changes: 3 additions & 3 deletions lib/measures/default_feature_reports/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>default_feature_reports</name>
<uid>9ee3135a-8070-4408-bfa1-b75fecf9dd4f</uid>
<version_id>1f0dd70a-ddad-4bb8-a54b-0aeb696e80d0</version_id>
<version_modified>2024-06-20T19:28:12Z</version_modified>
<version_id>43be79bc-ba24-44e0-923f-3f618951a054</version_id>
<version_modified>2024-07-16T17:52:08Z</version_modified>
<xml_checksum>FB304155</xml_checksum>
<class_name>DefaultFeatureReports</class_name>
<display_name>DefaultFeatureReports</display_name>
Expand Down Expand Up @@ -128,7 +128,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>005CDD6D</checksum>
<checksum>2B9D1AAE</checksum>
</file>
<file>
<filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
Expand Down
6 changes: 3 additions & 3 deletions lib/measures/export_time_series_modelica/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>export_time_series_loads_csv</name>
<uid>9fcf6116-c2eb-43d6-93f0-e1bdd822f768</uid>
<version_id>0b134568-d3a8-4ede-bf22-2010a173ea97</version_id>
<version_modified>2024-01-08T22:54:07Z</version_modified>
<version_id>8bd4bc8e-f597-47f9-82b9-044a06977bb1</version_id>
<version_modified>2024-07-16T17:52:07Z</version_modified>
<xml_checksum>9BF1E6AC</xml_checksum>
<class_name>ExportTimeSeriesLoadsCSV</class_name>
<display_name>ExportTimeSeriesLoadsCSV</display_name>
Expand Down Expand Up @@ -111,7 +111,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>EC8615DF</checksum>
<checksum>EB4FBA91</checksum>
</file>
<file>
<filename>os_lib_helper_methods.rb</filename>
Expand Down
2 changes: 1 addition & 1 deletion lib/urbanopt/reporting/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

module URBANopt
module Reporting
VERSION = '0.10.1'.freeze
VERSION = '0.11.0'.freeze
end
end
18 changes: 9 additions & 9 deletions urbanopt-reporting-gem.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
spec.bindir = 'exe'
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']
spec.required_ruby_version = '~> 2.7.0'
# We support exactly Ruby v3.2.2 because os-extension requires bundler==2.4.10 and that requires Ruby 3.2.2: https://stdgems.org/bundler/
# It would be nice to be able to use newer patches of Ruby 3.2, which would require os-extension to relax its dependency on bundler.
spec.required_ruby_version = '3.2.2'

spec.add_development_dependency 'bundler', '~> 2.1'
spec.add_development_dependency 'rake', '~> 13.1'
spec.add_development_dependency 'rspec', '~> 3.12'
spec.add_development_dependency 'simplecov', '~> 0.18.2'
spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
spec.add_development_dependency 'rspec', '~> 3.13'
spec.add_development_dependency 'simplecov', '0.22.0'
spec.add_development_dependency 'simplecov-lcov', '0.8.0'

spec.add_runtime_dependency 'json_pure', '~> 2.3'
spec.add_runtime_dependency 'json-schema', '~> 2.7'
spec.add_dependency 'openstudio-extension', '~> 0.7.1'
spec.add_runtime_dependency 'json_pure', '~> 2.7'
spec.add_runtime_dependency 'json-schema', '~> 4.3.1'
spec.add_dependency 'openstudio-extension', '~> 0.8.1'
end