wolfhece 2.1.58__py3-none-any.whl → 2.1.60__py3-none-any.whl

wolfhece/PyDraw.py

@@ -8397,22 +8397,23 @@ class WolfMapViewer(wx.Frame):
     def check_for_updates(self):
         """ Check for updates """
         from .apps.version import WolfVersion
-        import pkg_resources
+        import requests
 
         current_version = str(WolfVersion())
         package_name = "wolfhece"
 
         try:
-            available_version = pkg_resources.get_distribution(package_name).version
+            available_version = requests.get(f"https://pypi.org/pypi/{package_name}/json").json()["info"]["version"]
+
             if available_version > current_version:
-                with wx.MessageDialog(None, _("A new version is available: {}").format(available_version), _("Update"), wx.OK | wx.ICON_INFORMATION) as dlg:
+                with wx.MessageDialog(None, _("A new version is available: {}\n\nYour version is {}\n\nIf you want to upgrade, 'pip install wolfhece --upgrade' from your Python environment.").format(available_version, current_version), _("Upgrade"), wx.OK | wx.ICON_INFORMATION) as dlg:
                     dlg.ShowModal()
             else:
-                with wx.MessageDialog(None, _("You have the latest version."), _("Update"), wx.OK | wx.ICON_INFORMATION) as dlg:
+                with wx.MessageDialog(None, _("You have the latest version."), _("Upgrade"), wx.OK | wx.ICON_INFORMATION) as dlg:
                     dlg.ShowModal()
 
-        except pkg_resources.DistributionNotFound:
-            print("Package not found on PyPI.")
+        except Exception as e:
+            logging.error("Package not found on PyPI. -- {}".format(e))
 
     def print_shortcuts(self, inframe:bool = None):
         """ Print the list of shortcuts into logging """

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 58
+        self.patch = 60
 
     def __str__(self):
 

wolfhece/libs/__init__.py

@@ -3,6 +3,21 @@ import sys
 import os
 import shutil
 
+"""
+Mandatory DLLs for MKL and Fortran.
+
+MKL package and Fortran package installezd by pip
+copy the DLLs to the Library/bin folder of Python.
+
+This folder may not be in the PATH, so we need
+to copy the DLLs to the wolfhece's libs folder.
+
+Depending on the Python installation, the Library/bin
+folder may be in different locations. We search for it
+in the main directory of the Python interpreter and
+in the different site-packages folder.
+
+"""
 MKL_DLLS = ['libiomp5md.dll',
             'mkl_core.2.dll',
             'mkl_intel_thread.2.dll',
@@ -14,66 +29,60 @@ FORTRAN_DLLS = ['libifcoremd.dll',
                 'libmmdd.dll',
                 'svml_dispmd.dll',
                 'libiomp5md.dll']
-# VC_RUNTIME_DLLS = ['vcruntime140.dll',
-#                    'vcruntime140_1.dll']
-# HDF5_DLLS = ['hdf5.dll',
-#              'hdf5_hl.dll']
-
-interpreter_path = Path(sys.executable).parent
-library_bin_path = interpreter_path / 'Library' / 'bin'
-if not library_bin_path.exists():
-    if 'Scripts' in interpreter_path.parts:
-        library_bin_path = interpreter_path.parent / 'Library' / 'bin'
-
-h5py_path = interpreter_path / 'Lib' / 'site-packages' / 'h5py'
-mydir = Path(__file__).parent
 
+from site import getsitepackages
+
+def find_Librarybin(test):
+    """ Searching Library/bin folder """
+
+    interpreter_path = Path(sys.executable).parent
+    sites = getsitepackages()
+
+    candidate = interpreter_path / 'Library/bin'
+    if candidate.exists():
+        if (candidate/test).exists():
+            return candidate
+
+    for cursite in sites:
+        candidate = Path(cursite) / 'Library/bin'
+        if candidate.exists():
+            if (candidate/test).exists():
+                return candidate
+
+    return None
+
+mkl_path = find_Librarybin(MKL_DLLS[0])
+fortran_path = find_Librarybin(FORTRAN_DLLS[0])
+
+if mkl_path is None:
+    print("MKL package not found -- Please install MKL with 'pip install mkl'")
+if fortran_path is None:
+    print("Fortran package not found -- Please install Intel Fortran RunTime with 'pip install intel_fortran_rt'")
+
+if mkl_path is None or fortran_path is None:
+    raise FileNotFoundError("Missing MKL or Fortran package. Please check the output above.")
+
+mydir = Path(__file__).parent
 
 error = False
-if library_bin_path.exists():
+if mkl_path.exists():
     for dll in MKL_DLLS:
-        dll_path = library_bin_path / dll
-        if not dll_path.exists():
-            error = True
-            print(f"Missing DLL: {dll}")
-        else:
-            if not (mydir / dll).exists():
-                shutil.copy(dll_path, mydir / dll)
-
-    # for dll in VC_RUNTIME_DLLS:
-    #     dll_path = interpreter_path / dll
-    #     if not dll_path.exists():
-    #         error = True
-    #         print(f"Missing DLL: {dll}")
-    #     else:
-    #         if not (mydir / dll).exists():
-    #             shutil.copy(dll_path, mydir / dll)
-
-    for dll in FORTRAN_DLLS:
-        dll_path = library_bin_path / dll
+        dll_path = mkl_path / dll
         if not dll_path.exists():
             error = True
-            print(f"Missing DLL: {dll}")
+            print(f"Missing DLL: {dll} in {mkl_path}")
         else:
             if not (mydir / dll).exists():
                 shutil.copy(dll_path, mydir / dll)
 
-else:
-    error = True
-    print("Library/bin directory not found -- Impossible to copy DLLs.")
-
-# if h5py_path.exists():
-#     for dll in HDF5_DLLS:
-#         dll_path = h5py_path / dll
-#         if not dll_path.exists():
-#             error = True
-#             print(f"Missing DLL: {dll}")
-#         else:
-#             if not (mydir / dll).exists():
-#                 shutil.copy(dll_path, mydir / dll)
-# else:
-#     error = True
-#     print("h5py directory not found.")
+for dll in FORTRAN_DLLS:
+    dll_path = fortran_path / dll
+    if not dll_path.exists():
+        error = True
+        print(f"Missing DLL: {dll} in {fortran_path}")
+    else:
+        if not (mydir / dll).exists():
+            shutil.copy(dll_path, mydir / dll)
 
 if error:
     raise FileNotFoundError("Missing DLLs. Please check the output above.")

{wolfhece-2.1.58.dist-info → wolfhece-2.1.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.58
+Version: 2.1.60
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.58.dist-info → wolfhece-2.1.60.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=ZJoYLDrz5_jSMwLfdE0wjWa3eBmdmHOsZbrgxMPcbSU,407046
+wolfhece/PyDraw.py,sha256=OWcScU6OB2PSOizOBFc7ilSwpPrWfDYBhJAIxQ7lA-Q,407210
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YH
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=0lp2iLnoPUFxdKcw_jzmegskBPc16FjVo0YHgsdgPpQ,388
+wolfhece/apps/version.py,sha256=JxmjSazuCXVG7m7Z0RPKfHDtapKv30Ya4LTjYWXXdPg,388
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -175,7 +175,7 @@ wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqa
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
 wolfhece/libs/WolfDll.dll,sha256=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
-wolfhece/libs/__init__.py,sha256=KHR7OIX5YURmKmbx5LkORqUIhF1dz6e1Pf60yLuj0jw,2452
+wolfhece/libs/__init__.py,sha256=eAA6dNfD15XEuBk24yYUtSRpFc6MpJ_g42F_05gtRSA,2651
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
 wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY06nsNtFeS_swxJk,27912
 wolfhece/libs/api-ms-win-crt-runtime-l1-1-0.dll,sha256=NxpEq5FhSowm0Vm-uHKntD9WnLX6yK2pms6Y8mSjtQM,23304
@@ -283,8 +283,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.58.dist-info/METADATA,sha256=otlu_91hkUtPzxtyi71YB3WkoTgL4Lf-YaMPAGm9LBM,2541
-wolfhece-2.1.58.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.58.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.58.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.58.dist-info/RECORD,,
+wolfhece-2.1.60.dist-info/METADATA,sha256=BCXpcCPuPZ8Kpe_9bCPZoPTvQ69o041Ia9aF6uyAxmA,2541
+wolfhece-2.1.60.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.60.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.60.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.60.dist-info/RECORD,,