More IO Freeze Fixes #10411
More IO Freeze Fixes #10411
Conversation
Myoldmopar
added
the
DoNotPublish
| @@ -74,6 +74,7 @@ cmake-build-* | |||
| build-wheel/ | |||
| dist/ | |||
| energyplus.egg-info | |||
| wheelhouse/ | |||
There was a problem hiding this comment.
The auditwheel package puts patched up wheels into the wheelhouse directory, so I'm just adding that to the ignore list here.
| python: | ||
| install: | ||
| - requirements: doc/readthedocs/requirements.txt | ||
|
|
||
| submodules: | ||
| exclude: all |
There was a problem hiding this comment.
Adding a bit of extra stuff to the read-the-docs config file so hopefully those docs build again.
| @@ -57,6 +57,8 @@ install(FILES "versions/V9-5-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUp | |||
| install(FILES "versions/V9-6-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") | |||
| install(FILES "versions/V22-1-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") | |||
| install(FILES "versions/V22-2-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") | |||
| install(FILES "versions/V23-1-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") | |||
| install(FILES "versions/V23-2-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") | |||
There was a problem hiding this comment.
I was informed we were missing an IDD from the install, and I found both 23.1 and 23.2 were missing from this list. Apparently 23.2 is there from a different CMake command, but I'm putting them both here for completion.
| ] | ||
| ) | ||
| print(f"EnergyPlus finished with outputs in directory: {run_dir}") | ||
| exit(return_value) |
There was a problem hiding this comment.
This is a script that no one needs to worry about really. When I need to debug code that specifically calls into EnergyPlus from the API, this will be a very helpful little script to keep right in the repo. I doubt anyone else will ever use it...
| @@ -97,7 +97,7 @@ def get_current_wheel_details(): | |||
| }, | |||
| "Linux": { | |||
| "x86_64": { | |||
| "wheel": "linux_x86_64", | |||
| "wheel": "manylinux_2_17_x86_64", | |||
There was a problem hiding this comment.
It looks like we should be able to meet the constraints of the manylinux_2_17_x86_64 wheel, so that's nice.
src/EnergyPlus/PluginManager.cc
Outdated
| // https://docs.python.org/3/c-api/init_config.html#preinitialize-python-with-pypreconfig | ||
| // It looks like we don't need to initialize from config again, it should be all set up with | ||
| // the init calls above, so just initialize and move on. | ||
| Py_Initialize(); |
…n't depend on libomp (which we do not ship)
#10306 - Static gfortran
|
I tested this on all 3 platforms, including basic install structure, running a Python Plugin file, and running Fortran-based transition on a 23.2 file and seeing it successfully transition and run. Merging this and tagging IO freeze. |
Fixed a few issues identified during IO freeze RC testing, and a little extra stuff I was already working on.