add more git info; remove depricated np.NaN

Author: briantoby

GSASII/GSASIIpath.py

@@ -294,7 +294,17 @@ def GetVersionNumber():
     else:
         return "unknown"
 
+def getG2Branch():
+    '''Get name of current branch, as named on local computer
+    '''
+    if HowIsG2Installed().startswith('git'):
+        g2repo = openGitRepo(path2GSAS2)
+        return g2repo.active_branch.name
+    
 def getG2VersionInfo():
+    '''Get the git version information. This can be a bit slow, so reading
+    .../GSASII/saved_version.py may be faster (in main but not master branch)
+    '''
     if HowIsG2Installed().startswith('git'):
         g2repo = openGitRepo(path2GSAS2)
         commit = g2repo.head.commit
@@ -2265,7 +2275,7 @@ def condaInstall(packageList):
                   '\nConsider using the "conda install conda" command')
         return None
     try:
-        print(f'preparing to install {packageList}'+
+        print(f'Preparing to install package(s): {" ,".join(packageList)}'+
                   '\nThis can take a while')
         # the next line works, but the subsequent cli is considered more stable
         #conda.cli.main('install',  '-y', *packageList)

GSASII/GSASIIseqGUI.py

@@ -86,7 +86,7 @@ def GetSampleParms():
                 else:  # item missing from tree! stick in NaN's!
                     sampleData = {}
                 for item in sampleParmDict:
-                    sampleParmDict[item].append(sampleData.get(item,np.NaN))
+                    sampleParmDict[item].append(sampleData.get(item,np.nan))
         for item in sampleParmDict:
             if sampleParmDict[item]:
                 frstValue = sampleParmDict[item][0]

GSASII/imports/G2pwd_CIF.py

@@ -255,7 +255,7 @@ def Reader(self,filename, ParentFrame=None, **kwarg):
             for val in cf[blk].get(xcf,'?'):
                 v,e = cif.get_number_with_esd(val)
                 if v is None: # not parsed
-                    vl.append(np.NaN)
+                    vl.append(np.nan)
                 else:
                     vl.append(v)
             x = np.array(vl)
@@ -269,8 +269,8 @@ def Reader(self,filename, ParentFrame=None, **kwarg):
         for val in cf[blk].get(ycf,'?'):
             v,e = cif.get_number_with_esd(val)
             if v is None: # not parsed
-                vl.append(np.NaN)
-                v2.append(np.NaN)
+                vl.append(np.nan)
+                v2.append(np.nan)
             else:
                 vl.append(v)
                 if e is None:
@@ -315,7 +315,7 @@ def Reader(self,filename, ParentFrame=None, **kwarg):
                 for val in cf[blk].get(sucf,'?'):
                     v,e = cif.get_number_with_esd(val)
                     if v is None or e is None: # not parsed or no ESD
-                        vl.append(np.NaN)
+                        vl.append(np.nan)
                     elif e <= 0:
                         vl.append(1.)
                     else:
@@ -328,7 +328,7 @@ def Reader(self,filename, ParentFrame=None, **kwarg):
             for val in cf[blk].get(ycf,'?'):
                 v,e = cif.get_number_with_esd(val)
                 if v is None: # not parsed
-                    vl.append(np.NaN)
+                    vl.append(np.nan)
                 else:
                     vl.append(v)
             y /= np.array(vl)