Updated Pyfunnel to correct issue with regular expression (#596)

This is for #594

Author: mwetter

.travis.yml

@@ -13,7 +13,7 @@ env:
     - DOCKER_REPONAME=lbnlblum
     - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
     - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.55.11
-    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64
+    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64_rev-1
     - MPLBACKEND=agg
 
 notifications:

buildingspy/CHANGES.txt

@@ -1,9 +1,11 @@
 BuildingsPy Changelog
 ---------------------
 
-Version 5.2.0, xxxx
-^^^^^^^^^^^^^^^^^^^
+Version 5.2.0, March 14, 2025
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+- Updated pyfunnel requirement to version 1.0.2 to avoid a problem with regular expressions.
+  (https://github.com/lbl-srg/BuildingsPy/issues/594)
 - In buildingspy/simulate/Dymola.py and in buildingspy/development/regressiontest.py,
   switched simulator from dymola to dmc unless a gui window is requested.
   (https://github.com/lbl-srg/BuildingsPy/issues/590)
@@ -13,10 +15,6 @@ Version 5.2.0, xxxx
   (https://github.com/lbl-srg/BuildingsPy/issues/586)
 - In buildingspy/simulate/base_simulator.py, corrected statement for error reporting.
   (https://github.com/lbl-srg/BuildingsPy/issues/583)
-- In buildingspy/development/simulationCompare.py, added option to skip verification of results.
-  The default is set to False and hence this change does not affect the behavior of scripts developed
-  for previous versions.
-  (https://github.com/lbl-srg/BuildingsPy/issues/568)
 - In buildingspy/development/merger.py, added new comment form to allow excluding
   Modelica code for certain libraries.
   (https://github.com/lbl-srg/BuildingsPy/issues/566)

buildingspy/VERSION

@@ -1 +1 @@
-5.2.dev0
+5.2.0

buildingspy/development/simulationCompare.py

@@ -33,8 +33,6 @@ class Comparator(object):
     :param branches: A list of branches to compare, such as ``['master', 'issueXXX']``.
     :param package: Name of top-level package to compare, such as ``Buildings`` or ``Buildings.Examples``.
     :param repo: Name of repository, such as ``https://github.com/lbl-srg/modelica-buildings``.
-    :param skipVerification: Boolean (default ``False``).
-            If ``True``, unit test results are not verified against reference points.
     :param nPro: Number of threads that are used to run the translations and simulations.
                  Set to ``0`` to use all processors.
     :param tolAbsTim: float (default ``0.1``). Absolute tolerance in time, if exceeded, results will be flagged in summary table.
@@ -55,7 +53,6 @@ class Comparator(object):
        ...   branches=['master'],
        ...   package='Buildings',
        ...   repo='https://github.com/lbl-srg/modelica-buildings',
-       ...   skipVerification = True,
        ...   postCloneCommand=[
        ...      "python",
        ...      "Buildings/Resources/src/ThermalZones/install.py",
@@ -87,7 +84,6 @@ def __init__(
             branches,
             package,
             repo,
-            skipVerification=False,
             nPro=0,
             simulate=True,
             tolAbsTime=0.1,
@@ -99,7 +95,6 @@ def __init__(
         self._branches = branches
         self._package = package
         self._lib_src = repo
-        self._skip_verification = skipVerification
         self._nPro = nPro
         self._tolAbsTime = tolAbsTime
         self._tolRelTime = tolRelTime
@@ -180,9 +175,7 @@ def _runUnitTest(self, package, tool):
         else:
             num_pro = f"-n {self._nPro}"
 
-        ski_ver = f"--skip-verification" if {self._skip_verification} else ""
-
-        command = f"../bin/runUnitTests.py {single_package} {ski_ver} {num_pro} -t {tool} --batch"
+        command = f"../bin/runUnitTests.py {single_package} {num_pro} -t {tool} --batch"
         try:
             os.system(command)
         except OSError:

buildingspy/tests/MyModelicaLibrary/Resources/C-Sources/MySleep.c

@@ -2,6 +2,7 @@
 #include <Windows.h>
 #else
 #include <unistd.h>
+#include <time.h>
 #endif
 
 int MySleep(int sec)
@@ -10,6 +11,8 @@ int MySleep(int sec)
   Sleep(sec);
   return 0;
 #else
-  return sleep(sec);
+  clock_t start_time = clock();
+  while (clock() < start_time + sec*1000);
+  return 0;
 #endif
 }

requirements.txt

@@ -7,7 +7,7 @@ gitpython>=3.1.33; python_version>='3.8'
 pytidylib==0.3.2
 simplejson==3.16.0
 six==1.14.0
-pyfunnel==0.3.0
+pyfunnel==1.0.2
 PyYAML==6.0.1
 cerberus==1.3.4
 

setup.py

@@ -41,7 +41,7 @@
         'pytidylib>=0.3.2',
         'simplejson>=3.16',
         'six>=1.14',
-        'pyfunnel>=0.3.0',
+        'pyfunnel>=1.0.2',
         'PyYAML>=6.0.1',
         'cerberus>=1.3.4',
     ],