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

Fix #3961 - Fix build error with Python bindings due to zlib's crypt.h #3963

Merged
merged 11 commits into from May 7, 2020

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented May 4, 2020

Pull request overview

  • Fixes Failed to build Python bindings on Ubuntu with 3.x #3961
  • Update the cmake call to find python to modern cmake's FindPython instead of FindPythonInterp, and default to using py3 if not specified since python 2 has been EOL since January 1, 2020.
  • Use my own fork of zlib/1.2.11@nrel/testing where I made it not install the minizip crypt.h

Build of python bindings now suceeds, so fix #3961. The python bindings are still broken, but that should be addressed separately.

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

…o Python3 since python2 is EOL sicne January 1 2020
…doesn't install crypt.h when minizip is used.
@jmarrec jmarrec added the Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. label May 4, 2020
@jmarrec jmarrec self-assigned this May 4, 2020
@@ -72,7 +72,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
#boost_geometry/${BOOST_VERSION}@bincrafters/stable
pugixml/1.10@bincrafters/stable
jsoncpp/1.9.2
zlib/1.2.11
zlib/1.2.11@nrel/testing # TODO: Temp, pending merging of https://github.com/conan-io/conan-center-index/pull/1526, to resolve #3961
Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks like this has been approved and just wanting on the merge. conan-io/conan-center-index#1526. It'd be nice to have a ref to the official vs using the NREL so we can wait on this for another couple of days and check back.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It won't be merged until I get approved in their Early access program, where access is granted by batches every two or three weeks from what I gathered after asking them directly.

It also ties into #3940, at some point I'd just make this nrel/stable instead of nrel/testing and that's it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

okay, well if that's the case we can make the change at later date.

@tijcolem tijcolem merged commit 91832e0 into develop May 7, 2020
@tijcolem tijcolem deleted the 3961_Python_zlib branch May 7, 2020 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Failed to build Python bindings on Ubuntu with 3.x
2 participants