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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update antlr4 and use a non-deprecated docker base image #66

Merged
merged 12 commits into from
Oct 5, 2023

Conversation

vtnate
Copy link
Collaborator

@vtnate vtnate commented Aug 29, 2023

Antlr4 4.8 is well out of date(released Jan 4, 2020). The current version is 4.13.1 (released Sep 4, 2023). Updating should at least address some deprecation warnings coming through in the GMT tests.

  • Update to antlr 4.13
  • Update the deprecated docker base image being used by Antlr in modelica-builder. NREL IT certificate interception prevents building the docker image when on VPN or on campus network 馃槥.
  • Rebuild the docker container following the instructions in the main readme.
  • Update dependencies with Poetry
  • Run CI tests on Python 3.9 & 3.11 in Ubuntu
    • Eventually we should support Windows. That's a problem for future me.

@vtnate vtnate added the dependencies Pull requests that update a dependency file label Aug 29, 2023
@vtnate vtnate self-assigned this Aug 29, 2023
@vtnate vtnate marked this pull request as draft August 29, 2023 19:10
@vtnate vtnate changed the title update antlr4 to 4.13.0 update antlr4 Sep 26, 2023
@vtnate vtnate marked this pull request as ready for review September 26, 2023 18:39
@coveralls
Copy link

coveralls commented Sep 29, 2023

Pull Request Test Coverage Report for Build 6421234958

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.004%) to 93.19%

Totals Coverage Status
Change from base Build 6413464500: 0.004%
Covered Lines: 1642
Relevant Lines: 1762

馃挍 - Coveralls

@vtnate vtnate requested a review from nllong September 29, 2023 15:32
@vtnate vtnate changed the title update antlr4 update antlr4 and use a non-deprecated docker base image Oct 3, 2023
Copy link
Member

@nllong nllong left a comment

Choose a reason for hiding this comment

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

amazing! Merge once you fix the poetry conflict!

let鈥檚 gooooooo

@nllong nllong changed the title update antlr4 and use a non-deprecated docker base image Update antlr4 and use a non-deprecated docker base image Oct 5, 2023
@nllong nllong merged commit 0fc4b5e into develop Oct 5, 2023
2 checks passed
@nllong nllong deleted the newer-dependencies branch October 5, 2023 17:23
nllong added a commit that referenced this pull request Oct 5, 2023
* 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)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nathan Moore <nathan.moore@nrel.gov>
nllong added a commit that referenced this pull request Jan 4, 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

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nathan Moore <nathan.moore@nrel.gov>
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
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants