Changeset 4741

Timestamp:

Jan 7, 2021 6:06:12 PM (3 years ago)

Author:

toby

Message:

deal with install python not matching target system

Files:

• install/bootstrap.py (modified) (4 diffs)
• install/g2complete/build.sh.template (modified) (1 diff)
• trunk/GSASIIpath.py (modified) (2 diffs)

install/bootstrap.py

@@ -22 +22 @@
 allBinaries = False        # if True, causes all binaries to be installed
                            #--> True: -allbinaries or -server
-numpyVersion=None          # if specified, gives a specific numpy version to use (such as 1.18)
+
+npVersion=None          # when set, gives a specific numpy version to use (such as 1.18)
                            # for selecting a set of binaries to use
                            #--> Set by: -binary=
+
+pyVersion=None             # when set, gives a specific Python version to use (such as 3.7)
+                           # for selecting a set of binaries to use
+                           #--> Set by: -binary=
+
 
 for a in sys.argv[1:]:
@@ -38 +44 @@
         allBinaries = True
     elif 'binary' in a.lower():
-        numpyVersion = a.split('=')[1]
+        vers = a.split('=')[1].split(',')
+        npVersion = vers[0]
+        if len(vers) > 1:
+            pyVersion = vers[1]
         skipInstallChecks = True
         if sys.platform.startswith('win'): showWXerror = True
@@ -58 +67 @@
     --help        this message
     --nonet       skip steps requiring internet
-    --binary=ver  specifies a specific numpy binary directory to use (such as 
-                  --binary=1.18); turns on --noinstall and --noproxy
+
+    --binary=npver          specifies a specific numpy/python version to use in selecting 
+    --binary=npver,pyver    a binary directory to use ; turns on --noinstall and --noproxy
+           (example --binary=1.18 or --binary=1.18,3.7)
+           turns on --noinstall and --noproxy
 ''')
     sys.exit()
@@ -587 +599 @@
         msg = 'Binary load failed. Subversion problem? Please seek help'
         BailOut(msg)
-elif numpyVersion:
-    binaryVersion = GSASIIpath.GetBinaryPrefix()+'_n'+numpyVersion
+elif npVersion:
+    binaryVersion = GSASIIpath.GetBinaryPrefix(pyver)+'_n'+npVersion
     print('Load binaries from '+binaryVersion)
     if not GSASIIpath.svnSwitchDir('bindist','',g2home+ 'Binaries/'+binaryVersion,None,True):

install/g2complete/build.sh.template

@@ -8 +8 @@
 mkdir -p $PREFIX/GSASII
 cp $RECIPE_DIR/src/bootstrap.py $PREFIX/GSASII
-python $PREFIX/GSASII/bootstrap.py --binary=**npversion** > $PREFIX/GSASII/conda_G2build_out.log 2>  $PREFIX/GSASII/conda_G2build_errors.log
+python $PREFIX/GSASII/bootstrap.py --binary=**npversion**,**pyversion** > $PREFIX/GSASII/conda_G2build_out.log 2>&1

trunk/GSASIIpath.py

@@ -751 +751 @@
     return updatecount,modcount,locked
 
-def GetBinaryPrefix():
+def GetBinaryPrefix(pyver=None):
     if sys.platform == "win32":
         prefix = 'win'
@@ -767 +767 @@
 
     # format current python version
-    pyver = 'p{}.{}'.format(*sys.version_info[0:2])
+    if pyver:
+        pyver = 'p'+pyver
+    else:
+        pyver = 'p{}.{}'.format(*sys.version_info[0:2])
 
     items = [prefix,bits,pyver]