wolfhece 2.1.103__py3-none-any.whl → 2.1.104__py3-none-any.whl

wolfhece/apps/check_install.py

@@ -14,29 +14,29 @@ def main():
     ret = 'Checking installation\n---------------------\n\n'
 
 
-    # Get list of packages
+    # Get list of all packages
     import pkg_resources
     installed_packages = pkg_resources.working_set
-    packages = sorted(["%s==%s" % (i.key, i.version) for i in installed_packages])
+    packages = sorted(["%s" % (i.key) for i in installed_packages])
 
     #is osgeo in packages?
-    if 'osgeo' in packages:
+    if 'osgeo' in packages or 'gdal' in packages:
         ret += 'OSGeo seems installed\n\n'
     else:
         ret += 'OSGeo not installed\n Please install GDAL from https://github.com/cgohlke/geospatial-wheels/releases\n\n'
 
-    if 'wolfgpu' in packages:
-        ret += 'WolfGPU seems installed\n\n'
-    else:
-        ret += 'WolfGPU not installed\n Please install WolfGPU if needed\n\n'
-
     try:
         from osgeo import ogr, gdal
-        ret += 'GDAL/OGR installed\n\n'
+        ret += 'Correct import of osgeo package - GDAL/OGR installed\n\n'
     except ImportError as e:
-        ret += 'GDAL/OGR not installed\n Please install GDAL from https://github.com/cgohlke/geospatial-wheels/releases\n\n'
+        ret += 'Error during osgeo import - GDAL/OGR not/bad installed\n Please (re)install GDAL (64 bits version) from https://github.com/cgohlke/geospatial-wheels/releases\n\n'
         ret += 'Error : ' + str(e) + '\n\n'
 
+    if 'wolfgpu' in packages:
+        ret += 'WolfGPU seems installed\n\n'
+    else:
+        ret += 'WolfGPU not installed\n Please install WolfGPU if needed\n\n'
+
     try:
         from ..libs import wolfpy
         ret += 'Wolfpy accessible\n\n'

wolfhece/apps/version.py

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

{wolfhece-2.1.103.dist-info → wolfhece-2.1.104.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.103
+Version: 2.1.104
 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.103.dist-info → wolfhece-2.1.104.dist-info}/RECORD

@@ -73,13 +73,13 @@ wolfhece/apps/WolfPython2.png,sha256=VMPV-M-3BCOg8zOJss8bXwPmzRYZy8Fo-XtnVYNgbaw
 wolfhece/apps/WolfPython3.png,sha256=3G84zx14HnlB9YXMY4VUAO7IB3eu7JFvi4Kpmc_4zBE,403298
 wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/acceptability.py,sha256=hMIxTRNQARTTWJJaakb6kEK9udNh-w64VDgxxezVk3k,790
-wolfhece/apps/check_install.py,sha256=kpfBBGjYqu_Ptk2XlQWmiXHxpiWY4ICt3N4B1VsACgs,2299
+wolfhece/apps/check_install.py,sha256=Zb_HE43sT6f-BOjvQUa-Kur6TjedFKUcwZOgTkKH3Sc,2398
 wolfhece/apps/check_version.py,sha256=Zze7ltzcM2ZzIGMwkcASIjapCG8CEzzW9kwNscA3NhM,1768
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 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=JzbTGIrCJEVfos-Oqf4HYsLQF6ZIUulzpzVopj07hdk,389
+wolfhece/apps/version.py,sha256=n7akH_alRd4UzgK20bebXm0Lqdk8wOrmsDS7aC8QH_E,389
 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
@@ -292,8 +292,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.103.dist-info/METADATA,sha256=P_o5O7D46xHTvlo0hbWZ22gjXmXz14bE2xqOjlekwD0,2618
-wolfhece-2.1.103.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-wolfhece-2.1.103.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.103.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.103.dist-info/RECORD,,
+wolfhece-2.1.104.dist-info/METADATA,sha256=ccImhLoF0Q0GeJKNyWSqPXzau2pP4yJQNfwWdsJO4Z4,2618
+wolfhece-2.1.104.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+wolfhece-2.1.104.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.104.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.104.dist-info/RECORD,,