update lib folders

OpenWaterAnalytics · Mar 23, 2024 · 5858772 · 5858772
1 parent 29dc893
commit 5858772
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/epyt/epanet.py b/epyt/epanet.py
@@ -12803,15 +12803,16 @@ def __init__(self, version=2.2, msx=False):
         self.binfile = None
 
         # Check platform and Load epanet library
-        libname = f"epanet{str(version).replace('.', '_')}"
+        # libname = f"epanet{str(version).replace('.', '_')}"
+        libname = f"epanet"
         ops = platform.system().lower()
         if ops in ["windows"]:
             if "32" in str(platform.architecture()):
-                self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", libname, '32bit',
-                                                                        f"{libname[:-2]}.dll"))
+                self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", '32bit',
+                                                                        f"{libname}2.dll"))
             elif "64" in str(platform.architecture()):
-                self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", libname, '64bit',
-                                                                        f"{libname[:-2]}.dll"))
+                self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", '64bit',
+                                                                        f"{libname}2.dll"))
         elif ops in ["darwin"]:
             self.LibEPANET = resource_filename("epyt", os.path.join("libraries", f"mac/lib{libname}.dylib"))
         else:

diff --git a/...libraries/win/epanet2_2/32bit/epanet2.dll → epyt/libraries/win/32bit/epanet2.dll b/...libraries/win/epanet2_2/32bit/epanet2.dll → epyt/libraries/win/32bit/epanet2.dll
diff --git a/...libraries/win/epanet2_2/32bit/epanet2.exe → epyt/libraries/win/32bit/epanet2.exe b/...libraries/win/epanet2_2/32bit/epanet2.exe → epyt/libraries/win/32bit/epanet2.exe
diff --git a/...libraries/win/epanet2_2/64bit/epanet2.dll → epyt/libraries/win/64bit/epanet2.dll b/...libraries/win/epanet2_2/64bit/epanet2.dll → epyt/libraries/win/64bit/epanet2.dll
diff --git a/...libraries/win/epanet2_2/64bit/epanet2.exe → epyt/libraries/win/64bit/epanet2.exe b/...libraries/win/epanet2_2/64bit/epanet2.exe → epyt/libraries/win/64bit/epanet2.exe
diff --git a/...braries/win/epanet2_2/64bit/epanetmsx.dll → epyt/libraries/win/64bit/epanetmsx.dll b/...braries/win/epanet2_2/64bit/epanetmsx.dll → epyt/libraries/win/64bit/epanetmsx.dll
diff --git a/...braries/win/epanet2_2/64bit/epanetmsx.exe → epyt/libraries/win/64bit/epanetmsx.exe b/...braries/win/epanet2_2/64bit/epanetmsx.exe → epyt/libraries/win/64bit/epanetmsx.exe