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

Conan bump deps #4015

Merged
merged 10 commits into from
Aug 14, 2020
Merged

Conan bump deps #4015

merged 10 commits into from
Aug 14, 2020

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Jul 10, 2020

Pull request overview

This PR bumps the conan dependencies to try and use only packages in conan-center-index.

A companion PR exists for openstudio ruby: NREL/conan-openstudio-ruby#28

(This is also somewhat related to #3940, since if we end up freezing the dependencies, might as well get them in order and up to date)

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

  • 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)
  • Checked behavior in OpenStudioApplication, adjusted policies as needed (src/openstudio_lib/library/OpenStudioPolicy.xml)
  • 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 Developer Issue Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. labels Jul 10, 2020
@jmarrec jmarrec requested a review from tijcolem July 10, 2020 11:21
@jmarrec jmarrec self-assigned this Jul 10, 2020
websocketpp/0.8.1@bincrafters/stable
geographiclib/1.49@bincrafters/stable
swig_installer/4.0.1@bincrafters/stable
openstudio_ruby/2.5.5@nrel/testing # TODO: Temp #@nrel/stable
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Recipe done with this PR: NREL/conan-openstudio-ruby#28

Copy link
Collaborator

Choose a reason for hiding this comment

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

Are just waiting for that conan recipe to pass CI and push upstream? And then once that conan package is available we can change openstudio_ruby/2.5.5@nrel/testing to openstudio_ruby/2.5.5@nrel/stable?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes. I need a mac to debug why conan openstudio ruby is unhappy on the travis mac, but I failed to connect the NREL VPN yesterday after repeated attempts (not sure whether I forgot my password or my access is blocked). I need to pull my old MBP

Comment on lines 30 to 33
# Add NREL remote and place it first in line, so that if we vendor dependencies to NREL's repo they will be picked first
conan_add_remote(NAME nrel INDEX 0
URL https://api.bintray.com/conan/commercialbuilding/nrel)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Important (especially if we go for #3940)

Copy link
Collaborator Author

@jmarrec jmarrec left a comment

Choose a reason for hiding this comment

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

Pending the export of the new stable recipe, but lining up the change to be made to revert to stable

ConanInstall.cmake Outdated Show resolved Hide resolved
ConanInstall.cmake Outdated Show resolved Hide resolved
the 1.73 is untested, but since ruby stable is same as testing if it fails we can just revert that
@tijcolem tijcolem merged commit d04cabf into develop Aug 14, 2020
@tijcolem tijcolem deleted the conan_bump_deps branch August 14, 2020 23:48
jmarrec added a commit to openstudiocoalition/OpenStudioApplication that referenced this pull request Aug 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Developer Issue Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants