Merge remote-tracking branch 'origin/master' into develop

Author: briantoby

GSASII/git_verinfo.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # git_verinfo.py - GSAS-II version info from git
-# Do not edit, generated by 'GSASII/install/tag-version.py' command
-# Created 2025-02-14 11:35:30.542273-06:00
+# Do not edit, generated by 'GSASII/install/tag-version.py' script
+# Created 2025-02-23 10:15:56.232853-06:00
 
-git_version = '88aaa86a1f1a5a723dfe63f94dfb82f9d2b8eb48'
-git_tags = ['5803']
-git_prevtaggedversion = '45480f29835216e3376b2941edfbdba4de1f22dc'
-git_prevtags = ['5802']
-git_versiontag = '5.0.1'
+git_version = '0cc1b76caf527336878cb66f2eb4b103be22ead3'
+git_tags = ['5804']
+git_prevtaggedversion = '88aaa86a1f1a5a723dfe63f94dfb82f9d2b8eb48'
+git_prevtags = ['5803']
+git_versiontag = 'v5.1.0'

GSASII/imports/G2pwd_MIDAS.py

@@ -60,7 +60,15 @@ def ContentsValidator(self, filename):
             if all([(i in fp) for i in self.midassections]): # are expected MIDAS sections present?
                 self.mode = 'midas'
                 return True # must be present for Midas output
-        except:
+        except FileNotFoundError as msg:
+            self.errors = f'Exception from zarr module (version={zarr.__version__}):'
+            self.errors += '\n\t' + str(msg)
+            if os.path.exists(filename) and zarr.__version__.startswith('3.0'):
+                self.errors +='\n\n*** this is likely due to a buggy version of the zarr module'
+                self.errors +='\n*** please use "conda install zarr=2.18" to fix this'
+        except Exception as msg:
+            self.errors = f'Exception from zarr module (version={zarr.__version__}):'
+            self.errors += '\n\t' + str(msg)
             return False
         finally:
             del fp