Merge remote-tracking branch 'remotes/origin/main'

Author: vondreele

GSASII/GSASIIpath.py

@@ -2031,10 +2031,11 @@ def openInNewTerm(project=None,g2script=None,pythonapp=sys.executable):
 
 if __name__ == '__main__':
     '''What follows is called to update (or downdate) GSAS-II in a
-    separate process.
+    separate process. This is also called for background tasks such as 
+    performing a "git fetch" task or getting current tag information from
+    github.
     '''
     # check what type of update is being called for
-    import git
     gitUpdate = False
     preupdateType = None
     updateType = None
@@ -2096,6 +2097,11 @@ def openInNewTerm(project=None,g2script=None,pythonapp=sys.executable):
                 print('invalid form for --git-regress')
                 help = True
                 break
+            try:
+                import git
+            except:
+                print('Import of git failed for --git-regress')
+                sys.exit()
             gitversion = argsplit[1]
             # make sure the version or tag supplied is valid and convert to
             # a full sha hash
@@ -2242,23 +2248,23 @@ def openInNewTerm(project=None,g2script=None,pythonapp=sys.executable):
         fp.close()
         sys.exit()
 
+    try:
+        import git
+    except:
+        print(f'Import of git failed. {updateType} update mode {preupdateType}')
+        sys.exit()
+        
     if gitUpdate:
         import time
         time.sleep(1) # delay to give the main process a chance to exit
                       # so we don't change code for a running process
                       # windows does not like that
-        try:
-            import git
-        except:
-            print('git import failed')
-            sys.exit()
-        try:
-            g2repo = openGitRepo(path2GSAS2)
-        except Exception as msg:
-            print(f'Update failed with message {msg}\n')
-            sys.exit()
-        print('git repo opened')
-
+    try:
+        g2repo = openGitRepo(path2GSAS2)
+    except Exception as msg:
+        print(f'Update failed with message {msg}\n')
+        sys.exit()
+    print('git repo opened')
     if preupdateType == 'reset':
         # --git-reset   (preupdateType = 'reset')
         print('Restoring locally-updated GSAS-II files to original status')

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/incr-version.py' script
-# Created 2025-06-22 13:56:06.036268-05:00
+# Do not edit, generated by 'install/incr-version.py' script
+# Created 2025-06-25 08:39:57.064953-05:00
 
-git_version = '17c29ab4017926c607850a1989e82337049e1534'
-git_tags = ['5814']
-git_prevtaggedversion = 'c37c8ba4cdc73a97e0a8ccf9d9f3c95758502e5b'
-git_prevtags = ['5813']
-git_versiontag = 'v5.4.7'
+git_version = 'b91e5e3deb601e475ec53be39b25a82ad3491386'
+git_tags = ['5815']
+git_prevtaggedversion = '17c29ab4017926c607850a1989e82337049e1534'
+git_prevtags = ['5814']
+git_versiontag = 'v5.4.8'