Changeset 3201

Timestamp:

Dec 22, 2017 7:11:41 PM (4 years ago)

Author:

toby

Message:

update bootstrap for Py3

Location:

install

Files:

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

install/bootstrap.py

@@ -81 +81 @@
     out,err = s.communicate()
     if err:
-        print 'subversion error!\nout=',out
-        print 'err=',err
+        print('subversion error!\nout= '+out)
+        print('err= '+err)
         return None
     return out.strip()
@@ -100 +100 @@
 ################################################################################
 ################################################################################
-print 70*'*'
+print(70*'*')
 #testing for incorrect locale code'
 try:
@@ -106 +106 @@
     locale.getdefaultlocale()
 except ValueError:
-    print 'Your location is not set properly. This causes problems for matplotlib'
-    print '  (see https://github.com/matplotlib/matplotlib/issues/5420.)'
-    print 'Will try to bypass problem by setting LC_ALL to en_US.UTF-8 (US English)'
+    print('Your location is not set properly. This causes problems for matplotlib')
+    print('  (see https://github.com/matplotlib/matplotlib/issues/5420.)')
+    print('Will try to bypass problem by setting LC_ALL to en_US.UTF-8 (US English)')
     os.environ['LC_ALL'] = 'en_US.UTF-8'
     locale.getdefaultlocale()
-print 'Preloading matplotlib to build fonts...'
+print('Preloading matplotlib to build fonts...')
 try:
     import matplotlib
 except:
     pass
-print 'Checking python packages...',
+print('Checking python packages...')
 missing = []
 for pkg in ['numpy','scipy','matplotlib','wx',]:
@@ -125 +125 @@
 
 if missing:
-    print """Sorry, this version of Python cannot be used
+    msg = """Sorry, this version of Python cannot be used
 for GSAS-II. It is missing the following package(s):
-\t""",
-    for pkg in missing: print " ",pkg,
-    print "\nPlease install these package(s) and try running this again."
-    print "Showing first error: "
+\t"""
+    for pkg in missing: msg += " "+pkg
+    print(msg)
+    print("\nPlease install these package(s) and try running this again.")
+    print("Showing first error: ")
     for pkg in ['numpy','scipy','matplotlib','wx',]:
         exec('import '+pkg)
@@ -141 +142 @@
             from setuptools.command import easy_install                  
     except ImportError:
-        print 'You are missing the OpenGL Python package. This can be '
-        print 'installed by this script if the setuptools package is installed'
-        print 'Please install either OpenGL (pyopengl) or setuptools'
-        print "package and try running this again."
+        print('You are missing the OpenGL Python package. This can be ')
+        print('installed by this script if the setuptools package is installed')
+        print('Please install either OpenGL (pyopengl) or setuptools')
+        print("package and try running this again.")
         sys.exit()
-    print "Missing the OpenGL Python package. Will attempt to install this later."
+    print("Missing the OpenGL Python package. Will attempt to install this later.")
     def install_with_easyinstall(package):               
         try:             
-            print "trying system-wide ",                 
+            print("trying system-wide ")                 
             easy_install.main(['-f',os.path.split(__file__)[0],package])                 
             return               
@@ -155 +156 @@
             pass                 
         try:             
-            print "trying user level ",                  
+            print("trying user level ")                  
             easy_install.main(['-f',os.path.split(__file__)[0],'--user',package])                
             return               
         except:                  
-            print "\nInstall of "+package+" failed. Error traceback follows:"            
+            print("\nInstall of "+package+" failed. Error traceback follows:")
             import traceback             
-            print traceback.format_exc()                 
+            print(traceback.format_exc())
             sys.exit() 
 
-print '\nChecking for subversion...',
+print('\nChecking for subversion...')
 svn = whichsvn()
 if not svn:
-    print "Sorry, subversion (svn) could not be found on your system."
-    print "Please install this or place in path and rerun this."
+    print("Sorry, subversion (svn) could not be found on your system.")
+    print("Please install this or place in path and rerun this.")
     #raise Exception('Subversion (svn) not found')
     sys.exit()
-print ' found svn image: '+svn
+print(' found svn image: '+svn)
 
 if install_with_easyinstall:             
-    print '\nInstalling PyOpenGL. Lots of warnings will follow... ',             
+    print('\nInstalling PyOpenGL. Lots of warnings will follow... ')
     install_with_easyinstall('PyOpenGl')                 
-    print 'done.'
+    print('done.')
     
-print 'Ready to bootstrap GSAS-II from repository\n\t',g2home,'\nto '+path2GSAS2
+print('Ready to bootstrap GSAS-II from repository\n\t'+g2home+'\nto '+path2GSAS2)
 proxycmds = []
 proxyinfo = os.path.join(path2GSAS2,"proxyinfo.txt")
@@ -190 +191 @@
     os.remove(proxyinfo)
 print(70*"=")
+if sys.version_info[0] == 2:
+    getinput = raw_input
+else:
+    getinput = input
 if host:
-    ans = raw_input("Enter the proxy address (type none to remove) ["+host+"]: ")
+    ans = getinput("Enter the proxy address (type none to remove) ["+host+"]: ")
     if ans.strip().lower() == "none": host = ans = ""
 else:
-    ans = raw_input("Enter the proxy address [none needed]: ")
+    ans = getinput("Enter the proxy address [none needed]: ")
 if ans.strip() != "" or host:
     proxycmds.append('--config-option')
@@ -201 +206 @@
     fp = open(proxyinfo,'w')
     fp.write(ans.strip()+'\n')
-    ans = raw_input("Enter the proxy port ["+port+"]: ")
+    ans = getinput("Enter the proxy port ["+port+"]: ")
     if ans.strip() == "": ans=port
     proxycmds.append('--config-option')
@@ -212 +217 @@
 p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 res,err = p.communicate()
-if '.xor.' in res:
+if '.xor.' in str(res):
     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',
@@ -224 +229 @@
         print(res)
 # patch: switch GSAS-II location if switched to 2frame version (removed August 2017)
-if '2frame' in res:
+if '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,
@@ -242 +247 @@
 print('\n'+75*'*')
 print(msg + u' from ' + cmd[2])
-print 'svn load command:'
-for item in cmd: print item,
-print ""
+msg = 'svn load command: '
+for item in cmd: msg += " "+item
+print(msg)
 s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
 print('\nsubversion output:')
@@ -257 +262 @@
     cmd = [svn, 'co', g2home+ 'trunk/', path2GSAS2]
     if proxycmds: cmd += proxycmds
-    for item in cmd: print item,
-    print ""
+    msg = ""
+    for item in cmd: msg += item
+    print(msg)
     s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
     out,err = s.communicate()
@@ -313 +319 @@
                      cwd=path2GSAS2)
 res,err = p.communicate()
-if '==OK==' not in res or p.returncode != 0:
+if '==OK==' not in str(res) or p.returncode != 0:
     print('\n'+75*'=')
     print('Failed when testing the GSAS-II compiled files. GSAS-II will not run')
-    print('without correcting this.')
+    print('without correcting this.\n\nError message:')
     #print(res)
-    #print(err)
+    print(err)
     #print('\nAttempting to open a web page on compiling GSAS-II...')
     print('Please see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
@@ -324 +330 @@
     #webbrowser.open_new('https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII')
     print(75*'=')
-    if '86' in platform.machine() and (sys.platform.startswith('linux')
-                                        or sys.platform == "darwin"
-                                        or sys.platform.startswith('win')):
-        print('Platform '+sys.platform+' with processor type '+platform.machine()+' is supported')
-    else:
-        print('Platform '+sys.platform+' with processor type '+platform.machine()+' not is supported')
+#    if '86' in platform.machine() and (sys.platform.startswith('linux')
+#                                        or sys.platform == "darwin"
+#                                        or sys.platform.startswith('win')):
+#        print('Platform '+sys.platform+' with processor type '+platform.machine()+' is supported')
+#    else:
+#        print('Platform '+sys.platform+' with processor type '+platform.machine()+' not is supported')
     sys.exit()
 else:
-    print 'Successfully tested compiled routines'
+    print('Successfully tested compiled routines')
 #===========================================================================
 # import all .py files so that .pyc files get created
-print 'Byte-compiling all .py files...',
+print('Byte-compiling all .py files...')
 import compileall
 compileall.compile_dir(path2GSAS2,quiet=True)
-print 'done'
+print('done')
 #===========================================================================
 # platform-dependent stuff
 #===========================================================================
+if sys.version_info[0] > 2:
+    def execfile(file):
+        with open(file) as source_file:
+            exec(source_file.read())
 # on Windows, make a batch file with Python and GSAS-II location hard-coded
 if sys.platform.startswith('win') and os.path.exists(
@@ -355 +365 @@
 #===========================================================================
 # On linux, make desktop icon
-elif sys.platform.startswith('linux'):
-    desktop_template = """
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=xterm -hold -e bash -c "{} {}"
-Name=GSAS-II
-Icon={}
-Categories=Science;
-"""
-    loc = os.path.expanduser('~/Desktop/')
-    if "XDG_DATA_HOME" in os.environ and os.path.exists(os.path.join(os.environ.get("XDG_DATA_HOME"),"applications")):
-        loc = os.path.join(os.environ.get("XDG_DATA_HOME"),"applications")
-    elif "HOME" in os.environ and os.path.exists(os.path.join(os.environ.get("HOME"),".local/share/applications")):
-        loc = os.path.join(os.environ.get("HOME"),".local/share/applications")
-    elif not os.path.exists(loc):
-        loc = os.path.expanduser('~/')
-    dfile = os.path.join(loc,'GSASII.desktop')
-    icon = os.path.join(path2GSAS2, 'gsas2.png')
-    script = os.path.join(path2GSAS2, 'GSASII.py')
-    os.chmod(script, # make the .py file executable and readable
-             stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH)
-    try:
-        open(dfile,'w').write(desktop_template.format(sys.executable,script,icon))
-        os.chmod(
-            dfile,
-            stat.S_IWUSR | stat.S_IXUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IXOTH)
-        print("created GNOME/KDE desktop shortcut "+dfile)
-    except:
-        print("creation of file failed: "+dfile)
-
+elif sys.platform.startswith('linux') and os.path.exists(
+    os.path.join(path2GSAS2,"makeLinux.py")):
+    sys.argv = [os.path.join(path2GSAS2,"makeLinux.py")]
+    print(u'running '+sys.argv[0])
+    execfile(sys.argv[0])
+

install/g2conda/construct.yaml

@@ -1 +1 @@
 name: g2conda
 version: 0.1.2
-
+#conda install numpy scipy matplotlib pillow h5py pyopengl pywin32 svn wxpython m2w64-gcc-libgfortran
 install_in_dependency_order: True
 

install/g2pkg/meta.yaml

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