Changeset 2410 for install/g2pkg


Ignore:
Timestamp:
Aug 7, 2016 5:12:26 PM (5 years ago)
Author:
toby
Message:

update for new mac build

Location:
install/g2pkg
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • install/g2pkg/meta.yaml

    r2315 r2410  
    11package:
    22  name: g2load
    3   version: 0.1.7
     3  version: 0.1.8  # remember to change in construct.yaml to match
    44
    5 #source:
    6 #  path: ./src
     5source:
     6  path: ./src
    77
    88about:
  • install/g2pkg/post-link.bat

    r2371 r2410  
    11echo "Install GSAS-II from APS subversion server (v. 2016/7/12)"
    2 rem echo a error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
    32mkdir "%PREFIX%\GSASII"
    4 rem echo b error level is %ERRORLEVEL%  >> "%PREFIX%\install-out.txt"
    53copy "%PREFIX%\Scripts\gsas2-install.py" "%PREFIX%\GSASII\bootstrap.py"
    6 rem echo c error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
    74set "python=%PREFIX%\python.exe"
    85set "script=%PREFIX%\GSASII\bootstrap.py"
    9 rem echo d error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
    106"%python%" "%script%"
    11 rem echo e error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
    127pause
    13 rem echo f error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
    148set errorlevel=0
    15 rem echo g error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
    169exit 0
    17 rem echo h error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
  • install/g2pkg/src/bootstrap.py

    r2345 r2410  
    66home = 'https://subversion.xray.aps.anl.gov/pyGSAS/'
    77print 70*'*'
    8 print 'Preload matplotlib to build fonts...'
     8#testing for incorrect locale code'
     9try:
     10    import locale
     11    locale.getdefaultlocale()
     12except ValueError:
     13    print 'Your location is not set properly. This causes problems for matplotlib'
     14    print '  (see https://github.com/matplotlib/matplotlib/issues/5420.)'
     15    print 'Will try to bypass problem by setting LC_ALL to en_US.UTF-8 (US English)'
     16    os.environ['LC_ALL'] = 'en_US.UTF-8'
     17    locale.getdefaultlocale()
     18print 'Preloading matplotlib to build fonts...'
    919try:
    1020    import matplotlib
     
    1323print 'Checking python packages...',
    1424missing = []
    15 for pkg in ['numpy','scipy','matplotlib','wx','OpenGL']:
     25for pkg in ['numpy','scipy','matplotlib','wx',]:
    1626    try:
    1727        exec('import '+pkg)
     
    2838    print "specially configured version of the free Anaconda python package."
    2939    print "Please contact Brian Toby (toby@anl.gov)"
     40    for pkg in ['numpy','scipy','matplotlib','wx',]:
     41        exec('import '+pkg)
    3042    sys.exit()
     43try:
     44    import OpenGL
     45except:
     46    print "Missing the OpenGL Python package."
     47    print "This should not happen as this script should be called with a "
     48    print "specially configured version of the free Anaconda python package,"
     49    print "but GSAS-II can install this package anyway."
     50    print "Please contact Brian Toby (toby@anl.gov) to report this problem."
    3151
    3252# path to where this script is located
Note: See TracChangeset for help on using the changeset viewer.