diff --git a/.github/workflows/nightly_ci_build.yml b/.github/workflows/nightly_ci_build.yml index 9ab179b..2b80e76 100644 --- a/.github/workflows/nightly_ci_build.yml +++ b/.github/workflows/nightly_ci_build.yml @@ -1,5 +1,5 @@ -name: nightly_build +name: RNM-gem CI on: # push: @@ -7,6 +7,8 @@ on: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule # 5:23 am UTC (11:23pm MDT the day before) every weekday night in MDT - cron: '23 5 * * 2-6' + pull_request: + types: [review_requested] env: # This env var should enforce develop branch of all dependencies @@ -17,20 +19,22 @@ jobs: weeknight-tests: runs-on: ubuntu-latest container: - image: docker://nrel/openstudio:3.6.1 + image: docker://nrel/openstudio:3.7.0 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: set git config options + shell: bash + run: | + git config --global --add safe.directory '*' - name: Update gems run: | ruby --version bundle update bundle exec certified-update - name: Run Rspec - continue-on-error: true - # Continue to upload step even if a test fails, so we can troubleshoot run: bundle exec rspec - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 # Only upload if rspec fails if: ${{ failure() }} with: diff --git a/CHANGELOG.md b/CHANGELOG.md index cba1391..9aaf2d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## Version 0.7.0 +Date Range 06/30/23 - 01/09/24 + +* remove Jenkinsfile by @vtnate in https://github.com/urbanopt/urbanopt-rnm-us-gem/pull/34 +* also run CI when a PR gets a review request by @vtnate in https://github.com/urbanopt/urbanopt-rnm-us-gem/pull/35 +* Support OpenStudio 3.7 by @vtnate in https://github.com/urbanopt/urbanopt-rnm-us-gem/pull/36 + +**Full Changelog**: https://github.com/urbanopt/urbanopt-rnm-us-gem/compare/v0.6.0...v0.7.0 + ## Version 0.6.0 Date Range: 6/7/23 - 6/30/23 diff --git a/Gemfile b/Gemfile index 348d4f7..6c5a5e8 100644 --- a/Gemfile +++ b/Gemfile @@ -6,11 +6,16 @@ gemspec # if you want to use local gems during development, use this environment variable to enable them allow_local = ENV['FAVOR_LOCAL_GEMS'] +# pin this dependency to avoid unicode_normalize error +gem 'addressable', '2.8.1' +# pin this dependency to avoid using racc dependency (which has native extensions) +gem 'parser', '3.2.2.2' + # Below is an example of how to configure the gemfile for developing with local gems # modify as appropriate # if allow_local && File.exists?('../urbanopt-geojson-gem') -# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' + # gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' # elsif allow_local -# gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'os361' -# end \ No newline at end of file +# gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'os37' +# end diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index daf833e..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,10 +0,0 @@ -//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs - -@Library('cbci_shared_libs') _ - -// Build for PR to develop branch only. -if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set - - urbanopt_rnm_us() - -} diff --git a/LICENSE.md b/LICENSE.md index 486cf9f..ddf412f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/README.md b/README.md index aad4e6e..df45129 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-rnm-us-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-rnm-us-gem?branch=develop) +[![RNM-gem CI](https://github.com/urbanopt/urbanopt-rnm-us-gem/actions/workflows/nightly_ci_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-rnm-us-gem/actions/workflows/nightly_ci_build.yml) # URBANopt RNM-US Gem @@ -47,16 +48,16 @@ bundle exec rake create_opendss_catalog[/desired/path/to/opendss_catalog.json] ## RNM-US API compatibility | API Version | RNM-US Gem Version | RNM-US exe Version | -| ----------- | ----------- | ---------------- | -| v1 | 0.3.0 and earlier | RNM-US_20220819 | -| v2 | 0.4.0 | RNM-US_20221018 | +| ----------- | ------------------ | ------------------ | +| v1 | 0.3.0 and earlier | RNM-US_20220819 | +| v2 | 0.4.0 | RNM-US_20221018 | ## Validation Functionality The validation and results visualization functionality is written in python. Follow these steps if you would like to use it. -1. Install python (3.10) if you do not already have it installed +1. Install python (>=3.10) if you do not already have it installed 1. Clone the repo to your computer 1. cd into the repo directory 1. run `bundle install` to install the required ruby dependencies diff --git a/lib/urbanopt/rnm/version.rb b/lib/urbanopt/rnm/version.rb index c703394..c3fdf85 100644 --- a/lib/urbanopt/rnm/version.rb +++ b/lib/urbanopt/rnm/version.rb @@ -5,6 +5,6 @@ module URBANopt module RNM - VERSION = '0.6.0'.freeze + VERSION = '0.7.0'.freeze end end diff --git a/urbanopt-rnm-us-gem.gemspec b/urbanopt-rnm-us-gem.gemspec index 5891671..383e54f 100644 --- a/urbanopt-rnm-us-gem.gemspec +++ b/urbanopt-rnm-us-gem.gemspec @@ -27,11 +27,11 @@ Gem::Specification.new do |spec| spec.add_dependency 'faraday', '~> 1.0.1' spec.add_dependency 'geoutm', '~> 1.0.2' spec.add_dependency 'rubyzip', '~> 2.3.2' - spec.add_dependency 'urbanopt-geojson', '~> 0.10.0' + spec.add_dependency 'urbanopt-geojson', '~> 0.11.1' spec.add_development_dependency 'bundler', '~> 2.1' - spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rspec', '~> 3.7' + spec.add_development_dependency 'rake', '~> 13.1' + spec.add_development_dependency 'rspec', '~> 3.12' # pin this dependency: spec.add_development_dependency 'parallel', '~> 1.19.1' spec.add_development_dependency 'rubocop-checkstyle_formatter', '~> 0.4.0'