Changeset 2855

Timestamp:

Jun 3, 2017 5:43:20 PM (7 years ago)

Author:

toby

Message:

rework bootstrap.py for more diagnostics; require wxpython 3.x for future g2conda builds

Location:

install

Files:

• bootstrap.py (modified) (3 diffs)
• g2conda/construct.yaml (modified) (1 diff)
• g2pkg/meta.yaml (modified) (1 diff)

install/bootstrap.py

@@ -154 +154 @@
 cmd = [svn, 'co', home+ 'trunk/', gsaspath, '--non-interactive', '--trust-server-cert']
 if proxycmds: cmd += proxycmds
-msg = 'loading GSAS-II'
-    
-print 70*'*'
-print msg + ' from ' + cmd[2]
+msg = 'Now preparing to install GSAS-II'
+print('\n'+75*'*')
+print(msg + u' from ' + cmd[2])
+print('  *** If GSAS-II fails to be installed, you likely have a network access')
+print('  *** problem, most commonly because you need to use a network proxy. Please')
+print('  *** check with a network administrator or use http://www.whatismyproxy.com/\n')
 print 'svn load command:'
 for item in cmd: print item,
@@ -171 +173 @@
 
 #===========================================================================
+# test if the compiled files load correctly
+#===========================================================================
+script = """
+try:
+    import GSASIIpath
+    import pyspg
+    import histogram2d
+    import polymask
+    import pypowder
+    import pytexture
+    pyspg.sgforpy('P -1')
+    print('==OK==')
+except:
+    pass
+"""
+p = subprocess.Popen([sys.executable,'-c',script],stdout=subprocess.PIPE,cwd=gsaspath)
+res,err = p.communicate()
+if '==OK==' not in res or p.returncode != 0:
+    print('\n'+75*'=')
+    print('Failed when testing the GSAS-II compiled files. GSAS-II will not run without')
+    print('correcting this. Attempting to open a web page on compiling GSAS-II...')
+    print('(https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII)')
+    print(75*'=')
+    print('\n')
+    import webbrowser
+    webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
+    sys.exit()
+else:
+    print 'Successfully tested compiled routines'
+#===========================================================================
 # import all .py files so that .pyc files get created
 print 'Byte-compiling all .py files...',
@@ -179 +211 @@
 # platform-dependent stuff
 #===========================================================================
-# on Windows, 
+# on Windows, make a batch file with Python and GSAS-II location hard-coded
 if sys.platform.startswith('win') and os.path.exists(
     os.path.join(gsaspath,"makeBat.py")):

install/g2conda/construct.yaml

@@ -19 +19 @@
   - pillow
   - pyopengl
-  - wxpython
+  - wxpython 3.*
   - svn
   - hdf5

install/g2pkg/meta.yaml

@@ -1 +1 @@
 package: 
   name: g2load
-  version: 0.1.8  # remember to change in construct.yaml to match
+  version: 0.1.8  # remember to change in g2conda/construct.yaml to match this
 
 source: