Revert "Merge branch 'u/danielsf/upgrade_to_1_4_1'"

patches/DM-7114-assertion_to_exception.patch

@@ -0,0 +1,15 @@
+diff --git a/src/hsm/PSFCorr.cpp b/src/hsm/PSFCorr.cpp
+index a9b3260..21b92b1 100644
+--- a/src/hsm/PSFCorr.cpp
++++ b/src/hsm/PSFCorr.cpp
+@@ -728,7 +728,9 @@ namespace hsm {
+         if (iy2 > ymax) iy2 = ymax;
+         dbg<<"y1,y2 = "<<y1<<','<<y2<<std::endl;
+         dbg<<"iy1,iy2 = "<<iy1<<','<<iy2<<std::endl;
+-        assert(iy1 <= iy2);
++        if (iy1 > iy2) {
++             throw HSMError("Vertical data bounds (iy1,iy2) don't make sense.");
++        }
+
+         //
+         /* Use these pointers to speed up referencing arrays */

patches/dyld_fallback_library_path.patch

@@ -0,0 +1,46 @@
+--- GalSim/SConstruct	2016-03-29 14:42:32.000000000 -0700
++++ GalSim/SConstruct	2016-04-09 04:43:01.000000000 -0700
+@@ -107,6 +107,13 @@
+          'this option enables SCons to set it back in for you by doing '+
+          '`scons DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH`.',
+          '', PathVariable.PathAccept))
++opts.Add(PathVariable('DYLD_FALLBACK_LIBRARY_PATH',
++         'Set the DYLD_FALLBACK_LIBRARY_PATH inside of SCons.  '+
++         'Particularly useful on El Capitan (and later), since Apple strips out '+
++         'DYLD_FALLBACK_LIBRARY_PATH from the environment that SCons sees, so if you need it, '+
++         'this option enables SCons to set it back in for you by doing '+
++         '`scons DYLD_FALLBACK_LIBRARY_PATH=$DYLD_FALLBACK_LIBRARY_PATH`.',
++         '', PathVariable.PathAccept))
+ opts.Add('NOSETESTS','Name of nosetests executable','')
+ opts.Add(BoolVariable('CACHE_LIB','Cache the results of the library checks',True))
+ opts.Add(BoolVariable('WITH_PROF',
+@@ -691,6 +698,11 @@
+         paths=paths.split(os.pathsep)
+         AddPath(lib_paths, paths)
+
++    if env['IMPORT_PATHS'] and os.environ.has_key('DYLD_FALLBACK_LIBRARY_PATH'):
++        paths=os.environ['DYLD_FALLBACK_LIBRARY_PATH']
++        paths=paths.split(os.pathsep)
++        AddPath(lib_paths, paths)
++
+     env.PrependENVPath('PATH', bin_paths)
+     env.Prepend(LIBPATH= lib_paths)
+     env.Prepend(CPPPATH= cpp_paths)
+@@ -714,12 +726,11 @@
+
+     env is the relevant SCons environment.
+     """
+-    if 'DYLD_LIBRARY_PATH' in env and env['DYLD_LIBRARY_PATH'] != '':
+-        pre = 'DYLD_LIBRARY_PATH=%r'%env['DYLD_LIBRARY_PATH']
+-        pname = "%s %s"%(pre,pname)
+-    if 'LD_LIBRARY_PATH' in env and env['LD_LIBRARY_PATH'] != '':
+-        pre = 'LD_LIBRARY_PATH=%r'%env['LD_LIBRARY_PATH']
+-        pname = "%s %s"%(pre,pname)
++    for var in ['DYLD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH', 'LD_LIBRARY_PATH']:
++        if var in env and env[var] != '':
++            pre = '%s=%r'%(var,env[var])
++            pname = "%s %s"%(pre,pname)
++
+     return pname
+
+ def AltTryRun(config, text, extension):

ups/eupspkg.cfg.sh

@@ -15,7 +15,7 @@ if [[ $OSTYPE == darwin* ]]; then
 	# with / (absolute) or @ (in which case it's most likely a @rpath).
 	# Note that $LIBPYTHON_DYLIB may not exist (e.g., if Python lib has
 	# been built as a framework -- like /usr/bin/python)
-	LIBPYTHON_DYLIB=$(python -c "import sysconfig, os.path; print(os.path.join(*sysconfig.get_config_vars('LIBDIR', 'LDLIBRARY')))")
+	LIBPYTHON_DYLIB=$(python -c "import sysconfig, os.path; print os.path.join(*sysconfig.get_config_vars('LIBDIR', 'LDLIBRARY'))")
 	if [[ -f "$LIBPYTHON_DYLIB" ]]; then
 		LIBPYTHON_DYLIB_INSTNAME=$(otool -X -D "$LIBPYTHON_DYLIB")
 		if [[ ! $LIBPYTHON_DYLIB_INSTNAME =~ [/@].* ]]; then
@@ -28,7 +28,7 @@ if [[ $OSTYPE == darwin* ]]; then
 		# the build to pass successfully. We'll patch the resultant _galsim.so in the build() phase,
 		# enabling it to find the correct libpython*.dylib w/o the ened to set DYLD_FALLBACK_LIBRARY_PATH
 		# at runtime
-		DYLD_FALLBACK_LIBRARY_PATH=$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
+		DYLD_FALLBACK_LIBRARY_PATH=$(python -c "import sysconfig; print sysconfig.get_config_var('LIBDIR')")
 		export SCONSFLAGS+=" DYLD_FALLBACK_LIBRARY_PATH='$DYLD_FALLBACK_LIBRARY_PATH'"
 	fi
 fi