Changeset 4696 for install/g2pkg

Timestamp:

Jan 1, 2021 5:23:45 PM (4 years ago)

Author:

toby

Message:

gsas2pkg updated buggy on Linux

Location:

install/g2pkg

Files:

• meta.yaml (modified) (3 diffs)
• post-link.sh (modified) (1 diff)

install/g2pkg/meta.yaml ¶

@@ -1 +1 @@
 package: 
   name: gsas2pkg
-  version: "1.1.0"  # remember to change in g2conda/construct.yaml to match this
+  version: "2.0.0"
 
 source:
@@ -16 +16 @@
     - python>=3.7
     - conda
-    - numpy>=1.18
+    - numpy
     - scipy
-    - matplotlib=3.0
+    - matplotlib>=3.3
     - pillow
     - pyopengl
@@ -28 +28 @@
     - pywin32                              [win]
     - python.app                           [osx]
-

install/g2pkg/post-link.sh ¶

@@ -1 +1 @@
 #!/bin/bash
-echo "Preparing to install GSAS-II from APS subversion server"
-mkdir $PREFIX/GSASII
-cp $PREFIX/bin/gsas2-install.py $PREFIX/GSASII/bootstrap.py
-echo $PREFIX/bin/python
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py
+mkdir -p $PREFIX/GSASII
+echo "Preparing to install GSAS-II from APS subversion server" > $PREFIX/GSASII/conda_inst.log
+cp $PREFIX/bin/gsas2-install.py $PREFIX/GSASII/bootstrap.py > $PREFIX/GSASII/conda_inst.log 2>&1
+echo $PREFIX/bin/python  >> $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py >> $PREFIX/GSASII/conda_inst.log 2>&1
+echo "# Commands to start GSAS-II" > $CONDA_ROOT/start_GSASII.sh
+echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_GSASII.sh
+if [ -e $PREFIX/bin/pythonw ]
+then
+   echo "$PREFIX/bin/pythonw $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
+else
+   echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
+fi