Ensure the correct template is loaded when parsing the package #81
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nllong
approved these changes
Jan 5, 2024
| @@ -99,7 +99,7 @@ def new_from_template(cls, | |||
| PackageParser: object of the package parser | |||
| """ | |||
| klass = PackageParser(path) | |||
| if not mbl_version: | |||
| if within and not mbl_version: | |||
vtnate
added a commit
that referenced
this pull request
Jan 5, 2024
* add get method for a component * Update README.rst * add extends argument manipulation * do not save temp file * build(deps): bump pygments from 2.12.0 to 2.15.0 Bumps [pygments](https://github.com/pygments/pygments) from 2.12.0 to 2.15.0. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](pygments/pygments@2.12.0...2.15.0) --- updated-dependencies: - dependency-name: pygments dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Update test_model.py * add method for getting and setting parameters * cleanup * add dictionary * fix end of dict fileg * Bump version and update test dependencies (#62) * bump version and update test depends * prepare the last of the release items * update _source on save_as (#64) * update deprecated call to pkg_resources (#65) * update deprecated call to pkg_resources * argh, pre-commit * import from `typing` instead of `typing.io` * Add poetry and remove tox (#67) * remove tox and add poetry * run pre-commit * add benchmark package * add building of doc in test * update dependendencies * precommit * Move Modelica methods over from GMT (#68) * remove tox and add poetry * run pre-commit * add benchmark package * add building of doc in test * update dependendencies * precommit * move modelica methods from gmt --------- Co-authored-by: Nathan Moore <nathan.moore@nrel.gov> * Update antlr4 and use a non-deprecated docker base image (#66) * update antlr4 to 4.13.0 * bump to antlrv4.13.1 * `poetry update` to bump dependency versions * remove redundant CI run * use os & python version matrix in github ci * eek, found an obvious miss of another antlr version mention * another `poetry update` to pick up the new antlr runtime version * use new base image in dockerfile * rebuild docker container * remove Windows from CI, it's too soon for that * update changelog (#70) * Support py312 (#73) * add support for python 3.12 * update dependencies * update pre-commit hooks with `pre-commit autoupdate` * Add method to scale loads in an MOS file (#74) * scale loads in mos file * cleanup doc * remove print * more documentation * bump version of antrl to 4.13.1 (#75) * add .mpignore to skip loading files in ModelicaProject (#77) * Upgrade to MBLv10 (#72) * use mblv10 when templating package.mo * add parameter for mbl_version in PackageParser * template mbl_version in top-level package.mot * test to confirm mbl_version gets templatized correctly in PackageParser * include python 3.12 in ci, which was accidentally forgotten * check for mbl_version when loading templates * Update copyright dates (#80) * update license dates * update copyright holder * update language in license * Prepare for v0.5.0 release (#79) * bump to v0.5.0, update changelog * Update CHANGELOG.rst --------- Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> * update dependencies * make if statement more constrained (#81) * Create config file to automatically publish to pypi when a Github release is made (#82) * automatic pypi release workflow config. needs pypi & github settings to work * bump versions of actions used in the release workflow * argh pre-commit * changelog for 0.5.1 * bump to version 0.5.1 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Nicholas Long <nicholas.long@nrel.gov> Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If we only check for
mbl_versionand not also forwithinthe GMT sometimes generates awithin None;which is incorrect. This way we use the right template.