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

Update commands, paths, and example files for Reopt v3 #463

Merged
merged 46 commits into from
May 14, 2024
Merged

Conversation

vtnate
Copy link
Collaborator

@vtnate vtnate commented Apr 25, 2024

Resolves #[issue number here]

Pull Request Description

  • REopt has permanently retired versions 1 & 2 of their API. We recently updated the reopt-gem to use v3 and this PR pulls in that capability.
  • Resilience capability in reopt has further changes that are necessary and are not included in the current reopt-gem update, so we now send an error message and quit if the user attempts to calculate resilience with reopt.
  • I improved the way we read the assumptions file from the project folder. For unknown reasons, my machine began including a .DS_Store file in the reopt folder when we make a new one with the CLI. Sneakily, it wasn't visible in the Finder, even when hidden files were exposed. Now we read the scenario-file and use the first assumptions file listed in there.
  • Unrelated to reopt, ditto-reader had a dependency change and we weren't restrictive enough with our versioning, so it broke. There is a separate PR which fixes ditto-reader. CI here will fail until that PR is merged, released, and picked up in our dependencies.json file. There is a PR specifically for that, which will need to be updated once ditto-reader is released.

Checklist (Delete lines that don't apply)

  • Unit tests have been added or updated
  • All ci tests pass (green)
  • An issue has been created (which will be used for the changelog)
  • This branch is up-to-date with develop

@vtnate vtnate added enhancement New feature or request fix-project-gemfile-before-merge Temporary dependency assignments for testing fix-gemfile-before-merge Temporary dependency assignments for testing labels Apr 25, 2024
@vtnate vtnate self-assigned this Apr 25, 2024
@vtnate vtnate marked this pull request as ready for review April 30, 2024 15:14
@vtnate vtnate requested a review from kflemin April 30, 2024 15:15
@vtnate vtnate removed fix-project-gemfile-before-merge Temporary dependency assignments for testing fix-gemfile-before-merge Temporary dependency assignments for testing labels May 7, 2024
kflemin and others added 25 commits May 7, 2024 14:23
@vtnate vtnate merged commit 1277359 into develop May 14, 2024
5 checks passed
@vtnate vtnate deleted the reopt-v3 branch May 14, 2024 22:43
vtnate added a commit that referenced this pull request May 15, 2024
* udpates for 0.11.1 release

* updates to support linux arm

* adding rescue blocks to catch errors

* Update CLI sub-commands to be consistent across commands (#455)

* delete improper white space at beginning of cli line

* standardize sys-param parameter

* update tests to use new sys-param cli parameter

* Install exact python dependency versions, and bump ThermalNetwork version (#457)

* expect new version of ThermalNetwork

* install exact python dependency versions, not fuzzy

* update error handling for installing python and dependencies (#458)

* test out develop gem package for macos

* add in path for python miniconda if user installs python

* revert back to using 0.11.1 gem packages for macos

* update error handling for installing python and dependencies

* revert to ThermalNetwork 0.2.3 to reduce dependency conflicts

* check for python version in a better way in spec file

* hard-code paths for installing python on Windows

* install ThermalNetwork 0.2.4

* update paths for windows only

* match path for gitbash script from tims branch

---------

Co-authored-by: tijcolem <tjc.coleman@gmail.com>
Co-authored-by: ci-commercialbuildings <cicommercialbuilding@gmail.com>
Co-authored-by: Nathan Moore <nathan.moore@nrel.gov>

* Update python dependency versions (#460)

* bump TN to 0.2.5

* bump disco to resolve pandas version conflicts

* use the newest version of ditto-reader

* update gmt version

* update code to work with gmt v0.7.0

* update tests to work with gmt v0.7.0

* fix code mistakes for calling gmt v0.7.0 properly

* try zipping rspec results before uploading artifact

* Update commands, paths, and example files for Reopt v3 (#463)

* skip resilience test until we fix that aspect of reopt processing

* update test reopt assumptions files to work with reopt v3

* update reopt assumptions files to work with reopt v3

* remove boilerplate comments

* bump to version 0.12.0

* add warning that resilience is not currently supported

* point to reopt-v3 branches of dependent gems

* clarify todo comment

* close with graceful message if reopt-resilience is attempted

* update assumptions files to match reopt-gem for v3

* update test files to work with reopt v3

* remove duplicative commands from reopt post-processing tests

* smarter way to select reopt assumptions file

* better way of finding python version for test

* remove wind from reopt assumptions file

* remove lat/long from assumptions files

* add wind, remove lat/long from test assumption files

* clean up gemfile, gemspec, and project gemfile

* delete test ghe_dir before testing

* restore project gemfile properly this time, ugh

* uuuuuuuugh get the right reporting-gem version

* update reporting-gem version

* add post-process step to opendss test

* reorder process call in opendss test

* attempt at fixing github caching issue

* Revert "attempt at fixing github caching issue"

This reverts commit 30cbca0.

* attempt to change pip cache permissions on github

* attempt to fix syntax for pip cache permissions

* fix help text for district_type in des_params

* fix des_params test call in basic tests for new gmt v0.7.0

* slightly different command for zip Action

* remove owership change attempt

* reopt resilience-not-supported wording

* remove duplicate test to generate a sys-param file

* debug GHA to troubleshoot disco test failure on CI

* directly install OS on runner instead of using container

* more OS debugging

* another attempt at troubleshooting

* farther down the rabbit hole

* another attempt at using the right Ruby

* go back to working ci config

* ignore warnings when installing dependencies...do not treat them as errors

---------

Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com>

* Prep 0.12.0 (#465)

* remove commented references to closed branch in Gemfile

* changelog entries for v0.12.0

* clean up CI config file

* rubocop

---------

Co-authored-by: tijcolem <tjc.coleman@gmail.com>
Co-authored-by: Ubuntu <ubuntu@ip-172-18-9-100.us-west-2.compute.internal>
Co-authored-by: Katherine Fleming <2205659+kflemin@users.noreply.github.com>
Co-authored-by: ci-commercialbuildings <cicommercialbuilding@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants