rtc-tools 2.7.0b2__py3-none-any.whl → 2.7.0b3__py3-none-any.whl

{rtc_tools-2.7.0b2.dist-info → rtc_tools-2.7.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtc-tools
-Version: 2.7.0b2
+Version: 2.7.0b3
 Summary: Toolbox for control and optimization of water systems.
 Home-page: https://oss.deltares.nl/web/rtc-tools/home
 Download-URL: http://github.com/deltares/rtc-tools/

{rtc_tools-2.7.0b2.dist-info → rtc_tools-2.7.0b3.dist-info}/RECORD

@@ -1,8 +1,8 @@
-rtc_tools-2.7.0b2.dist-info/licenses/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+rtc_tools-2.7.0b3.dist-info/licenses/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 rtctools/__init__.py,sha256=91hvS2-ryd2Pvw0COpsUzTwJwSnTZ035REiej-1hNI4,107
-rtctools/_version.py,sha256=q6k6Ps4WmLJhRlFVFHRR2NkjStRHaA6InzR0-8rVGpA,499
-rtctools/rtctoolsapp.py,sha256=VvoOgpu1R5vzaQsUzBjyB4uPenMv2yWukcA6N9KDEr8,4275
-rtctools/util.py,sha256=PaeKfDUA174ODZbY5fZjCTf-F-TdhW7yEuP189Ro190,9075
+rtctools/_version.py,sha256=ganxIymEg3h1O7JSnh2Gx5UEvYp0WT8K09e07trD_Tc,499
+rtctools/rtctoolsapp.py,sha256=2RVZI4QQUg0yC6ii4lr50yx1blEfHBFsAgUjLR5pBkA,4336
+rtctools/util.py,sha256=8IGva7xWcAH-9Xcr1LaxUpYoZjF6vbo1eqdNJ9pKgGA,9098
 rtctools/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rtctools/_internal/alias_tools.py,sha256=XuQSAhhFuVtwn0yrAObZWIKPsSF4j2axXRtEmitIFPs,5310
 rtctools/_internal/caching.py,sha256=p4gqSL7kCI7Hff-KjMEP7mhJCQSiU_lYm2MR7E18gBM,905
@@ -43,8 +43,8 @@ rtctools/simulation/csv_mixin.py,sha256=rGDUFPsqGHmF0_dWdXeWzWzMpkPmwCNweTBVrwSh
 rtctools/simulation/io_mixin.py,sha256=WIKOQxr3fS-aNbgjet9iWoUayuD22zLIYmqlWEqxXHo,6215
 rtctools/simulation/pi_mixin.py,sha256=_TU2DrK2MQqVsyrHBD9W4SDEuot9dYmgTDNiXkDAJfk,9833
 rtctools/simulation/simulation_problem.py,sha256=v5Lk2x-yuVb5s7ne5fFgxONxGniLHTyTR0XRzYRl1fw,50005
-rtc_tools-2.7.0b2.dist-info/METADATA,sha256=oX-1OeQXLeE-4_UnDJE9DPRSgFJb3FTER2mk2EByFOw,1774
-rtc_tools-2.7.0b2.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-rtc_tools-2.7.0b2.dist-info/entry_points.txt,sha256=DVS8sWf3b9ph9h8srEr6zmQ7ZKGwblwgZgGPZg-jRNQ,150
-rtc_tools-2.7.0b2.dist-info/top_level.txt,sha256=pnBrb58PFPd1kp1dqa-JHU7R55h3alDNJIJnF3Jf9Dw,9
-rtc_tools-2.7.0b2.dist-info/RECORD,,
+rtc_tools-2.7.0b3.dist-info/METADATA,sha256=9AlZnyaOZ9GKoaw3otBfOEiZxSLADXHdGwYVMS6wdhQ,1774
+rtc_tools-2.7.0b3.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+rtc_tools-2.7.0b3.dist-info/entry_points.txt,sha256=DVS8sWf3b9ph9h8srEr6zmQ7ZKGwblwgZgGPZg-jRNQ,150
+rtc_tools-2.7.0b3.dist-info/top_level.txt,sha256=pnBrb58PFPd1kp1dqa-JHU7R55h3alDNJIJnF3Jf9Dw,9
+rtc_tools-2.7.0b3.dist-info/RECORD,,

{rtc_tools-2.7.0b2.dist-info → rtc_tools-2.7.0b3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

rtctools/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-04-23T08:24:20+0200",
+ "date": "2025-05-23T14:56:50+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "1c7b20a741febcb81ad1b0b00a5a5d4ece276e13",
- "version": "2.7.0b2"
+ "full-revisionid": "16ab781cd81009655c779d5cc5b7c4aa3e73fa85",
+ "version": "2.7.0b3"
 }
 '''  # END VERSION_JSON
 

rtctools/rtctoolsapp.py

@@ -64,7 +64,7 @@ def copy_libraries(*args):
 
     for ep in importlib_metadata.entry_points(group="rtctools.libraries.modelica"):
         if ep.name == "library_folder":
-            library_folders.append(str(importlib.resources.files(ep.module).joinpath(ep.attr)))
+            library_folders.append(Path(importlib.resources.files(ep.module).joinpath(ep.attr)))
 
     tlds = {}
     for lf in library_folders:
@@ -104,7 +104,6 @@ def download_examples(*args):
     from zipfile import ZipFile
 
     version = rtctools.__version__
-    rtc_full_name = "rtc-tools-{}".format(version)
     try:
         url = "https://github.com/deltares/rtc-tools/zipball/{}".format(version)
 
@@ -117,11 +116,12 @@ def download_examples(*args):
 
     with ZipFile(local_filename, "r") as z:
         target = path / "rtc-tools-examples"
-        prefix = "{}/examples/".format(rtc_full_name)
+        zip_folder_name = next(x for x in z.namelist() if x.startswith("Deltares-rtc-tools-"))
+        prefix = "{}/examples/".format(zip_folder_name.rstrip("/"))
         members = [x for x in z.namelist() if x.startswith(prefix)]
         z.extractall(members=members)
         shutil.move(prefix, target)
-        shutil.rmtree(rtc_full_name)
+        shutil.rmtree(zip_folder_name)
 
         sys.exit("Succesfully downloaded the RTC-Tools examples to '{}'".format(target.resolve()))
 

rtctools/util.py

@@ -110,6 +110,7 @@ def run_optimization_problem(
             "GoalProgrammingMixin",
             "PIMixin",
             "CSVMixin",
+            "IOMixin",
             "ModelicaMixin",
             "PlanningMixin",
             "ControlTreeMixin",