Skip to content

Fix #5281 - Use rebuilt E+ with correct entitlements #5287

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.

Sign up for GitHub

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

Jump to bottom
Merged
wenyikuang merged 32 commits into from
Nov 12, 2024
Merged

Fix #5281 - Use rebuilt E+ with correct entitlements #5287

wenyikuang merged 32 commits into from
Nov 12, 2024

Conversation

@jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Nov 5, 2024

Pull request overview

cf https://github.com/jmarrec/EnergyPlus/releases/tag/v24.2.0a-entitlements

Pull Request Author

  • Model API Changes / Additions
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
  • Model API methods are tested (in src/model/test)
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
  • All new and existing tests passes
  • If methods have been deprecated, update rest of code to use the new methods

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified

@jmarrec jmarrec added severity - Major Bug component - CLI Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. python Pull requests that update Python code labels Nov 5, 2024
@jmarrec jmarrec self-assigned this Nov 5, 2024
@DavidGoldwasser DavidGoldwasser added this to the OpenStudio SDK 3.9.0 milestone Nov 5, 2024
@jmarrec
Copy link
Collaborator Author

jmarrec commented Nov 6, 2024

Tested these installers:

  • Clean docker ubuntu:jammy (22.04)
  • Clean docker ubuntu:noble (24.04)
  • Clean Windows 10 (20H2) Virtual Machine

I tested them on my GHA OpenStudio-Tester which adds a macOS x86_64 (caveat: this is an image with lots of preinstalled things) at https://github.com/jmarrec/OpenStudio-Tester/actions/runs/11702052467/job/32589418541 (don't mind the arm64 failure, it isn't built for incremental workflows on jenkins)

jmarrec and others added 21 commits November 6, 2024 14:30
@jmarrec
Fix #5290 - rename enums in Alfalfa to avoid clash with Utilities one…
cf2ee19 
…s for C#
@jmarrec
Rename ComponentBase to AlfalfaComponentBase for consistency with the…
21af047 
… rest
@jmarrec
Fixup the SWIG files
7464597
@jmarrec
Update workflow runners
c941416
@jmarrec
Move Alfalfa enums into Utilities to avoid "duplicate symbol '_CSharp…
db608bf 
…_OpenStudio_LeftShift__SWIG_1'"
@jmarrec
Place Alfalfa C# in model between OSVersion and Measure
bbc0a94
@TShapinsky
Fix namesapce for types in GTest
d865b87
@jmarrec
Merge pull request #5293 from NREL/CSharp-Alfalfa-Test-Fix
cab6ef6 
Fix namesapce for types in GTest
@jmarrec
Adjust includes: C# MSVC fails to compile this file as it doesn't kno…
c666655 
…w "string"
@jmarrec
[skip ci] clang format
31f12be
@jmarrec
Merge pull request #5291 from NREL/CSharp
b5a6c58 
Try to fix Broken C# bindings workflow due to Alfalfa addition
@jmarrec
Prepare a few broken OSWs for testing
5d301d8 
* One references a non existing measure
* One references a folder that can be found but isn't a valid BCLMeasure
* One has a ReportingMeasure before a ModelMeasure
@jmarrec
Don't use a measure that register an Error in the broken OSW (so they…
c5481ef 
… DO run with current C++ CLI to show problem)
@jmarrec
Add CLI tests with the broken OSWs, expect them to fail (they don't w…
6729e76 
…ith current C++ CLI)
@jmarrec
Add bool WorkflowJSON::validateMeasures() const: non-throwy, logs E…
b249fef 
…rror messages

TODO: should we return early?
@jmarrec
Use that in the RunInitialization job, and throw if invalid
dd6a610
@jmarrec
Test the new method
290661b 
Forgot to update the Ctest after using another measure
@jmarrec
When loading from a string that is actually a path, call setOswPath
4aafb5a
@TShapinsky
remove most point id requirements
912124c
@TShapinsky
remove unnecessary setting of point Id
257d8d3
@TShapinsky @jmarrec
Update src/alfalfa/AlfalfaJSON.cpp
25e61d0 
Co-authored-by: Julien Marrec <julien.marrec@gmail.com>
@ci-commercialbuildings
Copy link
Collaborator

ci-commercialbuildings commented Nov 12, 2024 •
edited
Loading

CI Results for a20a810:

@ci-commercialbuildings
Copy link
Collaborator

ci-commercialbuildings commented Nov 12, 2024 •
edited
Loading

CI Results for a20a810:

@wenyikuang
Copy link
Contributor

wenyikuang commented Nov 12, 2024

Great, ctest for python fixed

@wenyikuang wenyikuang merged commit 093d242 into develop Nov 12, 2024
@jmarrec jmarrec deleted the 5281_python_entitlements branch November 12, 2024 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jmarrec jmarrec

Labels

component - CLI Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. python Pull requests that update Python code severity - Major Bug

Projects

None yet

Milestone

OpenStudio SDK 3.9.0

Development

Successfully merging this pull request may close these issues.

Python Import Error on macOS after upgrading to E+ 24.2.0a

7 participants

@jmarrec @ci-commercialbuildings @wenyikuang @DavidGoldwasser @TShapinsky @kbenne