Update dependencies and changelog, clean imports

Author: AntoineGautier

buildingspy/CHANGES.txt

@@ -4,8 +4,9 @@ BuildingsPy Changelog
 Version 5.2.1, ...
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-- Updated pyfunnel to version 1.0.3 to fix plotting issues.
-  ([#599](https://github.com/lbl-srg/BuildingsPy/issues/599))
+- Updated pyfunnel to version 2.0.1 to fix plotting issues.
+  With this change, Python 2 is no longer supported.
+  (https://github.com/lbl-srg/BuildingsPy/issues/599)
 
 Version 5.2.0, March 14, 2025
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

buildingspy/development/regressiontest.py

@@ -7,10 +7,6 @@
 # [email protected]                            2011-02-23
 #######################################################
 #
-from collections import defaultdict
-from contextlib import contextmanager
-import difflib
-import fnmatch
 import functools
 import glob
 import io
@@ -24,19 +20,24 @@
 import sys
 import tempfile
 import time
-import webbrowser
+from collections import defaultdict
+from contextlib import contextmanager
+
 # Third-party module or package imports.
 import numpy as np
-import simplejson
+
 # Code repository sub-package imports.
 import pyfunnel
-from buildingspy.development import error_dictionary_openmodelica
-from buildingspy.development import error_dictionary_optimica
-from buildingspy.development import error_dictionary_dymola
-from buildingspy.io.outputfile import Reader
-from buildingspy.io.postprocess import Plotter
+
 import buildingspy.io.outputfile as of
 import buildingspy.io.reporter as rep
+from buildingspy.development import (
+    error_dictionary_dymola,
+    error_dictionary_openmodelica,
+    error_dictionary_optimica,
+)
+from buildingspy.io.outputfile import Reader
+from buildingspy.io.postprocess import Plotter
 
 
 def runSimulation(worDir, cmd):
@@ -3880,7 +3881,7 @@ def _get(model, key, data):
             return 0
 
         with open(self._statistics_log, 'r') as f:
-            staVal = simplejson.loads(f.read())
+            staVal = json.loads(f.read())
         data = []
         for case in staVal['testCase']:
             if 'translate' in case:
@@ -3902,7 +3903,7 @@ def _get(model, key, data):
                 temp['simulation']['state_events'] = case['simulate']['state_events'] if 'state_events' in case['simulate'] else 0
                 temp['simulation']['success'] = case['simulate']['result']
                 data.append(temp)
-        dataJson = simplejson.dumps(data)
+        dataJson = json.dumps(data)
         return dataJson
 
     def run(self):
@@ -4135,7 +4136,7 @@ def run(self):
                 # For Dymola: store available simulation info into
                 # self._comp_info used for reporting.
                 val = self._run_simulation_info()
-                self._comp_info = simplejson.loads(val)
+                self._comp_info = json.loads(val)
 
                 r = self._checkReferencePoints(ans)
                 if r != 0:  # In case of comparison error. Comparison warnings are handled
@@ -4154,7 +4155,7 @@ def run(self):
                 # For OpenModelica and OPTIMICA: store available translation and simulation info
                 # into self._comp_info used for reporting or for rewriting the configuration file.
                 with open(self._simulator_log_file, 'r') as f:
-                    self._comp_info = simplejson.loads(f.read())
+                    self._comp_info = json.loads(f.read())
 
             if not self._skip_verification:
                 r = self._checkReferencePoints(ans='N')

requirements.txt

@@ -5,9 +5,8 @@ gitpython>=3.1.33; python_version>='3.8'
 --only-binary numpy==1.21.4; python_version>='3.8'
 --only-binary scipy==1.7.3; python_version>='3.8'
 pytidylib==0.3.2
-simplejson==3.16.0
-six==1.14.0
-pyfunnel==1.0.3
+
+pyfunnel==2.0.1
 PyYAML==6.0.1
 cerberus==1.3.4
 

setup.py

@@ -1,6 +1,6 @@
 import io
-import platform
 import os
+
 from setuptools import setup
 
 # Python setup file.
@@ -39,9 +39,8 @@
         'numpy>=1.21',
         'scipy>=1.7',
         'pytidylib>=0.3.2',
-        'simplejson>=3.16',
-        'six>=1.14',
-        'pyfunnel>=1.0.3',
+
+        'pyfunnel>=2.0.1',
         'PyYAML>=6.0.1',
         'cerberus>=1.3.4',
     ],