Changeset 4446

Timestamp:

May 26, 2020 8:45:49 PM (3 years ago)

Author:

toby

Message:

final fixes of bootstrap

File:

• install/g2complete/src/bootstrap.py (modified) (6 diffs)

install/g2complete/src/bootstrap.py

@@ -18 +18 @@
 binaryVersion=None         # if specified, gives a specific numpy version to use (such as 1.18)
                            # for selecting a set of binaries to use
+numpyVersion=None
 
 for a in sys.argv[1:]:
@@ -85 +86 @@
         dlg.Destroy()
     else:
-        print("BOOTSTRAP WARNING: ",file=sys.stderr)
-        for line in msg.split('\n'):
-            print(line,file=sys.stderr)
-        print("Recreate this using command:")
+        print("Recreate error this using command:")
         print("     {} {} {}".format(
             os.path.abspath(sys.executable),
@@ -94 +92 @@
             ' '.join(sys.argv[1:]),
         ),file=sys.stderr)
+        print("\nBOOTSTRAP WARNING: ",file=sys.stderr)
+        for line in msg.split('\n'):
+            print(line,file=sys.stderr)
     sys.exit()
         
@@ -470 +471 @@
             msg += err
             if os.path.exists(os.path.join(path2GSAS2,"makeBat.py")):
-                msg += '\n\nGSAS-II failed to be updated. A likely reason is a network access'
-                msg += '\nproblem. If your web browser works, but the update did not.'
-                msg += '\nThe most common reason is you need to use a network proxy. Please'
+                msg += '\nGSAS-II appears to be installed but failed to be updated. A likely reason'
+                msg += '\nis a network access problem. If your web browser works, but this update did'
+                msg += '\nnot, the most common reason is you need to use a network proxy. Please'
                 msg += '\ncheck with a network administrator or use http://www.whatismyproxy.com/'
+                msg += '\n\nIf installing from the gsas2full dist and your computer is not connected'
+                msg += '\nto the internet, this error message can be ignored.\n'
             else:
                 # this will happen only with initial installs where all files
@@ -510 +513 @@
 # test if the compiled files load correctly
 #===========================================================================
+GSASIItested = False
 if not skipInstallChecks:
-    script = """  # commands that test each module can at least be loaded & run something in pyspg
-    try:
-        import GSASIIpath
-        GSASIIpath.SetBinaryPath(loadBinary=False)
-        import pyspg
-        import histogram2d
-        import polymask
-        import pypowder
-        import pytexture
-        pyspg.sgforpy('P -1')
-        print('==OK==')
-    except Exception as err:
-        print(err)
-    """
+    script = """  
+# commands that test each module can at least be loaded & run something in pyspg
+try:
+    import GSASIIpath
+    GSASIIpath.SetBinaryPath(loadBinary=False)
+    import pyspg
+    import histogram2d
+    import polymask
+    import pypowder
+    import pytexture
+    pyspg.sgforpy('P -1')
+    print('==OK==')
+except Exception as err:
+    print(err)
+"""
     p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,stderr=subprocess.PIPE,
                          cwd=path2GSAS2)
@@ -551 +556 @@
     else:
         print('Successfully tested compiled routines')
+        GSASIItested = True
 #===========================================================================
 # import all .py files so that .pyc files get created