Changeset 2410 for install/g2pkg/src

Timestamp:

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

Author:

toby

Message:

update for new mac build

Location:

install/g2pkg/src

Files:

• bootstrap.py (modified) (3 diffs)
• install.bat (deleted)

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