Merge remote-tracking branch 'origin/develop' into abstract-out-modelica-version

Author: Nicholas Long

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.9", "3.13"]
+        python-version: ["3.10", "3.13"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
@@ -18,10 +18,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Poetry
-        # Use Poetry 2.2.1 for Python 3.9 compatibility
         uses: Gr1N/setup-poetry@v9
-        with:
-          poetry-version: "2.2.1"
       - name: Install dependencies with Poetry
         # poetry setuptools workaround sourced from:
         # https://github.com/python-poetry/poetry/issues/7611#issuecomment-1711443539
@@ -32,6 +29,14 @@ jobs:
 
           # Install twine to test build
           python -m pip install build twine
+      - name: Install modelicafmt
+        env:
+          MODELICA_FMT_VERSION: v0.3.1
+        run: |
+          curl -SLO "https://github.com/urbanopt/modelica-fmt/releases/download/${MODELICA_FMT_VERSION}/modelica-fmt_Linux_x86_64.tar.gz"
+          tar --exclude='README.md' --exclude='CHANGELOG.md' -xzf modelica-fmt_Linux_x86_64.tar.gz
+          chmod +x modelicafmt
+          sudo mv modelicafmt /usr/local/bin/
       - name: Run pre-commit
         run: poetry run pre-commit run --all-files
       - name: Build docs

.pre-commit-config.yaml

@@ -1,7 +1,8 @@
 exclude: |
   (?x)(
     ^docs/conf.py|
-    ^modelica_builder/modelica_parser/
+    ^modelica_builder/modelica_parser/|
+    ^tests/data/
   )
 
 repos:
@@ -48,6 +49,15 @@ repos:
       - id: flake8
         args:
           ["--ignore=F401,E402,E501,E731,W503,W504", "--max-line-length=100"]
+  - repo: local
+    hooks:
+      - id: modelica-fmt
+        name: Modelica Formatter
+        types: [file]
+        files: \.(mo|mot|mopt)$
+        entry: modelicafmt
+        args: ["-w", "-wrap-arrays"]
+        language: system
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:

modelica_builder/modelica_parser/utils.py

@@ -3,8 +3,7 @@
 
 
 import sys
-
-from antlr4 import FileStream, CommonTokenStream
+from antlr4 import CommonTokenStream, FileStream
 from antlr4.error.ErrorListener import ErrorListener
 from antlr4.tree.Tree import TerminalNodeImpl
 

modelica_builder/modelica_project.py

@@ -108,7 +108,7 @@ def _load_data(self) -> None:
             patterns = []
             with open(project_ignore_file) as f:
                 patterns = f.read().splitlines()
-            spec = pathspec.PathSpec.from_lines(pathspec.patterns.GitWildMatchPattern, patterns)
+            spec = pathspec.GitIgnoreSpec.from_lines(patterns)
         else:
             spec = None
 

modelica_builder/templates/package.mot

@@ -1,5 +1,4 @@
 within {{within}};
 package {{name}}
   extends Modelica.Icons.Package;
-
 end {{name}};

modelica_builder/templates/package_base.mot

@@ -1,6 +1,10 @@
 package {{name}}
   extends Modelica.Icons.Package;
-
-  annotation (uses(
-    Modelica(version="{{modelica_version}}"), Buildings(version="{{mbl_version}}")), version="1");
+  annotation (
+    uses(
+      Modelica(
+        version="4.0.0"),
+      Buildings(
+        version="{{mbl_version}}")),
+    version="1");
 end {{name}};

poetry.lock

@@ -19,7 +19,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -29,25 +28,25 @@ classifiers = [
 [tool.poetry.dependencies]
 # Urbanopt SDK requires Python 3.10 as of UOv0.9.0
 # https://python-poetry.org/docs/dependency-specification/
-python = ">=3.9, <3.14"
+python = ">=3.10, <3.14"
 antlr4-python3-runtime = "4.13.2"
 jinja2 = "~3.1.4"
-pathspec = ">=0.11.2,<1.1.0"
+pathspec = ">=0.11.2,<1.2.0"
 certifi = ">=2024.8.30,<2027.0.0"
 
 [tool.poetry.group.dev.dependencies]
 autopep8 = "~2.3"
-coveralls = ">=3.3,<4.1"
-mypy = ">=1.18,<1.20"
-pre-commit = "~4.3"
-pytest = "~8.4"
+coveralls = ">=3.3,<4.2"
+mypy = ">=1.18,<2.4"
+pre-commit = "~4.6"
+pytest = "~9.1"
 pytest-cov = ">=5.0,<7.2"
 pytest-benchmark = "~5.2.3"
 # don't update sphinx right now
 sphinx = "~7.4"
 sphinx_rtd_theme = ">=3.0,<3.2"
 sphinx-jsonschema = "~1.19"
-syrupy = "~4.9"
+syrupy = "~5.5"
 toml = "~0.10"
 
 [build-system]

pyproject.toml

@@ -2,6 +2,7 @@
 # See also https://github.com/urbanopt/modelica-builder/blob/develop/LICENSE.md
 
 import os
+import re
 import shutil
 import unittest
 from pathlib import Path
@@ -56,7 +57,10 @@ def test_mbl_version(self):
         # check for strings in files
         with open(Path(self.output_dir) / 'package.mo') as f:
             file_data = f.read()
-            self.assertTrue('Buildings(version="2.0.0"' in file_data, 'Incorrect mbl_version')
+            self.assertTrue(
+                re.search(r'Buildings\(\s*version="2\.0\.0"', file_data),
+                'Incorrect mbl_version',
+            )
 
     def test_modelica_version_default(self):
         # verify backwards compatibility: when modelica_version isn't provided, default to 4.0.0