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

ResStock-HPXML: convert UpgradeCosts measure to ModelMeasure, try 2 #458

Merged
merged 34 commits into from
Jul 19, 2024

Conversation

joseph-robertson
Copy link
Contributor

Pull Request Description

Supersedes #455.

Checklist

Not all may apply

  • Code changes (must work)
  • Tests exercising your feature/bug fix (check coverage report on Checks -> BuildStockBatch Tests -> Artifacts)
  • Coverage has increased or at least not decreased. Update minimum_coverage in .github/workflows/coverage.yml as necessary.
  • All other unit and integration tests passing
  • Update validation for project config yaml file changes
  • Update existing documentation
  • Run a small batch run on Kestrel/Eagle to make sure it all works if you made changes that will affect Kestrel/Eagle
  • Add to the changelog_dev.rst file and propose migration text in the pull request

@joseph-robertson joseph-robertson self-assigned this Jul 11, 2024
@joseph-robertson joseph-robertson added this to the v2024.07.0 milestone Jul 17, 2024
Copy link

github-actions bot commented Jul 17, 2024

File Coverage
All files 88%
base.py 92%
exc.py 57%
hpc.py 79%
local.py 70%
postprocessing.py 84%
utils.py 92%
cloud/docker_base.py 88%
sampler/base.py 78%
sampler/downselect.py 33%
sampler/precomputed.py 93%
sampler/residential_quota.py 61%
test/shared_testing_stuff.py 85%
test/test_docker.py 33%
test/test_local.py 97%
test/test_validation.py 97%
workflow_generator/base.py 89%
workflow_generator/commercial/latest/commercial.py 52%
workflow_generator/residential/latest/residential_hpxml.py 77%
workflow_generator/residential/latest/tests/test_residential_workflow_generator.py 99%
workflow_generator/residential/v2024_07_18/residential_hpxml.py 91%
workflow_generator/residential/v2024_07_18/tests/test_residential_workflow_generator.py 99%

Minimum allowed coverage is 33%

Generated by 🐒 cobertura-action against cc152d2

@joseph-robertson joseph-robertson marked this pull request as ready for review July 17, 2024 19:32
"version": __version__,
"version_description": """
Version information for the residential workflow generator.
This version is compatible with ResStock v3.2.0 and later.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not true, right? Compatible with ResStock > v3.2.0.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. Thanks for catching this.

@@ -1,8 +1,7 @@
# frozen_string_literal: true
class Version
ResStock_Version = '3.1.0' # Version of ResStock
ResStock_Version = '2000.1.0' # Version of ResStock
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test against the new WorkflowGenerator_Version line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I forget why I made this change. ResStock_Version doesn't really matter for BuildStockBatch. We only care about "WorkflowGenerator_Version". I will address this.

Comment on lines 82 to 87
.. change::
:tags: general, feature
:pullreq: 458

For the Residential HPXML Workflow Generator, supports the UpgradeCosts measure
changing from ReportingMeasure to ModelMeasure.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth a much more comprehensive changelog entry than just this.

@@ -23,7 +23,7 @@ jobs:
with:
repository: NREL/resstock
path: resstock
ref: develop
ref: res-reporting
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before merge, need to switch this and down below back to develop (and make sure tests are still passing).

@rajeee rajeee merged commit bf86749 into develop Jul 19, 2024
7 checks passed
@joseph-robertson joseph-robertson deleted the res-reporting2 branch July 19, 2024 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants