Changeset 2410 for install

Timestamp:

Aug 7, 2016 5:12:26 PM (7 years ago)

Author:

toby

Message:

update for new mac build

Location:

install

Files:

• bootstrap.py (modified) (6 diffs)
• g2conda/construct.yaml (modified) (2 diffs)
• g2conda/g2install.bat (deleted)
• g2pkg/meta.yaml (modified) (1 diff)
• g2pkg/post-link.bat (modified) (1 diff)
• g2pkg/src/bootstrap.py (modified) (3 diffs)
• g2pkg/src/install.bat (deleted)

install/bootstrap.py

@@ -6 +6 @@
 home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
 print 70*'*'
+#testing for incorrect locale code'
+try:
+    import locale
+    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)'
+    os.environ['LC_ALL'] = 'en_US.UTF-8'
+    locale.getdefaultlocale()
+print 'Preloading matplotlib to build fonts...'
+try:
+    import matplotlib
+except:
+    pass
 print 'Checking python packages...',
 missing = []
-for pkg in ['numpy','scipy','matplotlib','wx']:
+for pkg in ['numpy','scipy','matplotlib','wx',]:
     try:
         exec('import '+pkg)
-    except ImportError:
+    except:
         missing.append(pkg)
-# handle pyopenGl differently, because that we can install later
-try:
-    import OpenGL as ogl
-    install_with_easyinstall = None
-except ImportError:
-    print '\nPyOpenGL not present. ',
-    try:
-        from setuptools.command import easy_install
-    except ImportError:
-        missing.append('setuptools')
-    def install_with_easyinstall(package):
-        try: 
-            print "trying system-wide ",
-            easy_install.main(['-f',os.path.split(__file__)[0],package])
-            return
-        except:
-            pass
-        try: 
-            print "trying user level ",
-            easy_install.main(['-f',os.path.split(__file__)[0],'--user',package])
-            return
-        except:
-            print "\nInstall of "+package+" failed. Please report this information:"
-            import traceback
-            print traceback.format_exc()
-            sys.exit()
 
 if missing:
@@ -46 +35 @@
     for pkg in missing: print " ",pkg,
     print 
-    print "We suggest installing the free Canopy Express package at http://www.enthought.com/downloads"
-    print "or the free Anaconda python package at https://store.continuum.io/cshop/anaconda/"
+    print "This should not happen as this script should be called with a "
+    print "specially configured version of the free Anaconda python package."
+    print "Please contact Brian Toby (toby@anl.gov)"
+    for pkg in ['numpy','scipy','matplotlib','wx',]:
+        exec('import '+pkg)
     sys.exit()
+try:
+    import OpenGL
+except:
+    print "Missing the OpenGL Python package." 
+    print "This should not happen as this script should be called with a "
+    print "specially configured version of the free Anaconda python package,"
+    print "but GSAS-II can install this package anyway." 
+    print "Please contact Brian Toby (toby@anl.gov) to report this problem."
 
 # path to where this script is located
@@ -64 +64 @@
     # add the standard location for wandisco svn to the path
     pathlist.append('/opt/subversion/bin')
+if sys.platform.startswith('win'):
+    svn = 'svn.exe'
+else:
+    svn = 'svn'
+# use svn installed via conda 1st (mac)
+if os.path.exists(os.path.join(os.path.split(sys.executable)[0],svn)):
+    pathlist.insert(0,os.path.split(sys.executable)[0])
+# use svn installed via conda 1st (Windows)
+if os.path.exists(os.path.join(os.path.split(sys.executable)[0],'Library','bin',svn)):
+    pathlist.insert(0,os.path.join(os.path.split(sys.executable)[0],'Library','bin'))
+
 for path in pathlist:
     svn = os.path.join(path,'svn')
@@ -75 +86 @@
 else:
     raise Exception('Subversion (svn) not found')
-print ' found svn in',svn
+print ' found svn image: '+svn
 
 print 'Ready to bootstrap GSAS-II from repository\n\t',home,'\nto '+gsaspath
@@ -135 +146 @@
 
 #===========================================================================
-# install OpenGL, if needed.
-if install_with_easyinstall:
-    print '\nInstalling PyOpenGL. Lots of warnings will follow... ',
-    install_with_easyinstall('PyOpenGl')
-    print 'done.'
-#===========================================================================
 # import all .py files so that .pyc files get created
 print 'Byte-compiling all .py files...',
@@ -157 +162 @@
 elif sys.platform.startswith('darwin') and os.path.exists(
     os.path.join(gsaspath,"makeMacApp.py")):
+    print('running '+os.path.join(gsaspath,"makeMacApp.py"))
     execfile(os.path.join(gsaspath,"makeMacApp.py"))
 #===========================================================================

install/g2conda/construct.yaml

@@ -9 +9 @@
 
 packages:
-  - g2load-0.1.7-0
+  - g2load-0.1.8-0
 
 specs:
@@ -29 +29 @@
   - pyqt
 
-post_install: g2install.bat           [win]
+#post_install: g2install.sh           [unix]
+#post_install: g2install.bat           [win]
 
 license_file: EULA.txt

install/g2pkg/meta.yaml

@@ -1 +1 @@
 package: 
   name: g2load
-  version: 0.1.7
+  version: 0.1.8  # remember to change in construct.yaml to match
 
-#source:
-#  path: ./src
+source:
+  path: ./src
 
 about:

install/g2pkg/post-link.bat

@@ -1 +1 @@
 echo "Install GSAS-II from APS subversion server (v. 2016/7/12)"
-rem echo a error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 mkdir "%PREFIX%\GSASII"
-rem echo b error level is %ERRORLEVEL%  >> "%PREFIX%\install-out.txt"
 copy "%PREFIX%\Scripts\gsas2-install.py" "%PREFIX%\GSASII\bootstrap.py"
-rem echo c error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 set "python=%PREFIX%\python.exe"
 set "script=%PREFIX%\GSASII\bootstrap.py"
-rem echo d error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 "%python%" "%script%"
-rem echo e error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 pause
-rem echo f error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 set errorlevel=0
-rem echo g error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 exit 0
-rem echo h error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"

install/g2pkg/src/bootstrap.py

@@ -6 +6 @@
 home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
 print 70*'*'
-print 'Preload matplotlib to build fonts...'
+#testing for incorrect locale code'
+try:
+    import locale
+    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)'
+    os.environ['LC_ALL'] = 'en_US.UTF-8'
+    locale.getdefaultlocale()
+print 'Preloading matplotlib to build fonts...'
 try:
     import matplotlib
@@ -13 +23 @@
 print 'Checking python packages...',
 missing = []
-for pkg in ['numpy','scipy','matplotlib','wx','OpenGL']:
+for pkg in ['numpy','scipy','matplotlib','wx',]:
     try:
         exec('import '+pkg)
@@ -28 +38 @@
     print "specially configured version of the free Anaconda python package."
     print "Please contact Brian Toby (toby@anl.gov)"
+    for pkg in ['numpy','scipy','matplotlib','wx',]:
+        exec('import '+pkg)
     sys.exit()
+try:
+    import OpenGL
+except:
+    print "Missing the OpenGL Python package." 
+    print "This should not happen as this script should be called with a "
+    print "specially configured version of the free Anaconda python package,"
+    print "but GSAS-II can install this package anyway." 
+    print "Please contact Brian Toby (toby@anl.gov) to report this problem."
 
 # path to where this script is located