Changeset 4771 for install/g2pkg

Timestamp:

Jan 16, 2021 10:17:50 AM (3 years ago)

Author:

toby

Message:

fixes for windows g2complete

File:

• install/g2pkg/src/bootstrap.py (modified) (16 diffs)

install/g2pkg/src/bootstrap.py

@@ -11 +11 @@
 skipInstallChecks = False  # if set to True, continue installation even if current Python lacks packages and
                            # skips platform-dependent installation steps
+                           #--> True: -noinstall or -binary=
 skipDownloadSteps = False  # if False, svn is used to download GSAS-II files and binaries 
+                           #--> True: -nonet
 skipProxy = False          # if False then the script creates a prompt asking for proxy info
+                           #--> True: -nonet or -noproxy or -binary=
 showWXerror = False        # if True, errors are shown in wxPython windows (used on Windows only)
+                           #--> True: -noinstall or -binary= (both on windows)
 help = False               # if True, a help message is shown
+                           #--> True: -help
 allBinaries = False        # if True, causes all binaries to be installed
-binaryVersion=None         # if specified, gives a specific numpy version to use (such as 1.18)
+                           #--> True: -allbinaries or -server
+
+npVersion=None          # when set, gives a specific numpy version to use (such as 1.18)
                            # for selecting a set of binaries to use
-numpyVersion=None
+                           #--> Set by: -binary=
+
+pyVersion=None             # when set, gives a specific Python version to use (such as 3.7)
+                           # for selecting a set of binaries to use
+                           #--> Set by: -binary=
+
 
 for a in sys.argv[1:]:
@@ -32 +44 @@
         allBinaries = True
     elif 'binary' in a.lower():
-        numpyVersion = a.split('=')[1]
+        vers = a.split('=')[1].split(',')
+        npVersion = vers[0]
+        if len(vers) > 1:
+            pyVersion = vers[1]
+            print('Selecting Python binary',pyVersion)
+        print('Selecting numpy binary',npVersion)
         skipInstallChecks = True
         if sys.platform.startswith('win'): showWXerror = True
@@ -52 +69 @@
     --help        this message
     --nonet       skip steps requiring internet
-    --binary=ver  specifies a specific numpy binary directory to use (such as 
-                  --binary=1.18); turns on --noinstall and --noproxy
+
+    --binary=npver          specifies a specific numpy/python version to use in selecting 
+    --binary=npver,pyver    a binary directory to use ; turns on --noinstall and --noproxy
+           (example --binary=1.18 or --binary=1.18,3.7)
+           turns on --noinstall and --noproxy
 ''')
     sys.exit()
@@ -253 +273 @@
     print(s)
 
-def svncleanup(spath):
-    cmd = [svn, 'cleanup', spath]
-    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
-    out,err = MakeByte2str(s.communicate())
-    if err:
-        print('subversion cleanup returned an error:')
-        if out: print(out)
-        if err: print(err)
+def svncleanup(spath,svn=None):
+    if not svn: svn = whichsvn()
+    if not svn: return
     svntmp = os.path.join(spath,'.svn','tmp')
-    if not os.path.exists(svntmp):
+    if os.path.exists(os.path.join(spath,'.svn')) and not os.path.exists(svntmp):
         print('missing subversion tmp directory, fixing')        
         cmd = ['mkdir',svntmp]
@@ -269 +284 @@
         if out: print(out)
         if err: print(err)
-    
+    if os.path.exists(os.path.join(spath,'.svn')):
+        cmd = [svn, 'cleanup', spath]
+        s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+        out,err = MakeByte2str(s.communicate())
+        if err:
+            print('subversion cleanup returned an error:')
+            if out: print(out)
+            if err: print(err)
+
 def svnChecksumPatch(svn,fpath,verstr):
     '''This performs a fix when svn cannot finish an update because of
@@ -291 +314 @@
         print('import of GSASIIpath completed')
     except Exception as err:
-        msg = 'Failed with import of GSASIIpath. This is unexpected.'
+        msg = 'Failed with import of GSASIIpath in svnChecksumPatch. This is unexpected.'
         msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
         print(err)
@@ -479 +502 @@
 if not skipDownloadSteps:
     # patch: switch GSAS-II location if linked to XOR server (relocated May/June 2017)
-    cmd = [svn, 'info']
+    cmd = [svn, 'info',path2GSAS2]
     p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     res,err = p.communicate()
@@ -485 +508 @@
         print('Switching previous install with .xor. download location to\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
         cmd = [svn, 'switch','--relocate','https://subversion.xor.aps.anl.gov/pyGSAS',
-               'https://subversion.xray.aps.anl.gov/pyGSAS']
+               'https://subversion.xray.aps.anl.gov/pyGSAS',path2GSAS2]
         if proxycmds: cmd += proxycmds
         p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
@@ -494 +517 @@
             print(res)
     # patch: switch GSAS-II location if switched to 2frame version (removed August 2017)
-    if '2frame' in str(res):
+    elif '2frame' in str(res):
         print('Switching previous 2frame install to trunk\n\thttps://subversion.xray.aps.anl.gov/pyGSAS')
         cmd = [svn, 'switch',g2home + '/trunk',path2GSAS2,
@@ -506 +529 @@
             print(err)
             print(res)
+    elif 'not a working' not in str(res):
+        svncleanup(path2GSAS2)
 
     print('\n'+75*'*')
@@ -562 +587 @@
             BailOut(msg)
     print('\n'+75*'*')
+else:
+    svncleanup(path2GSAS2)
 
 # subsequent commands require GSASIIpath which better be here now, import it
@@ -570 +597 @@
     msg = 'Failed with import of GSASIIpath. This is unexpected.'
     msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
+    print('GSASIIpath import error\n')
+    print(err)
     BailOut(msg)
 
@@ -579 +608 @@
         msg = 'Binary load failed. Subversion problem? Please seek help'
         BailOut(msg)
-elif numpyVersion:
-    binaryVersion = GSASIIpath.GetBinaryPrefix()+'_n'+numpyVersion
+elif npVersion:
+    binaryVersion = GSASIIpath.GetBinaryPrefix(pyVersion)+'_n'+npVersion
+    print('Load binaries from '+binaryVersion)
     if not GSASIIpath.svnSwitchDir('bindist','',g2home+ 'Binaries/'+binaryVersion,None,True):
         msg = 'Binary load failed with '+binaryVersion+'. Subversion problem? Please seek help'
         BailOut(msg)
 else:
+    print('Load binaries matching current python/numpy')
     GSASIIpath.DownloadG2Binaries(g2home)
         
@@ -649 +680 @@
             exec(source_file.read())
 
+#===========================================================================
+# on Windows, make a batch file with Python and GSAS-II location hard-coded
 if skipInstallChecks:
     pass
-#===========================================================================
-# on Windows, make a batch file with Python and GSAS-II location hard-coded
 elif sys.platform.startswith('win') and os.path.exists(
     os.path.join(path2GSAS2,"makeBat.py")):
@@ -659 +690 @@
 # on a Mac, make an applescript 
 elif sys.platform.startswith('darwin') and os.path.exists(
-    os.path.join(path2GSAS2,"makeMacApp.py")):
+         os.path.join(path2GSAS2,"makeMacApp.py")):
     sys.argv = [os.path.join(path2GSAS2,"makeMacApp.py")]
     print(u'running '+sys.argv[0])
@@ -666 +697 @@
 # On linux, make desktop icon
 elif sys.platform.startswith('linux') and os.path.exists(
-    os.path.join(path2GSAS2,"makeLinux.py")):
+         os.path.join(path2GSAS2,"makeLinux.py")):
     sys.argv = [os.path.join(path2GSAS2,"makeLinux.py")]
     print(u'running '+sys.argv[0])