Changeset 9939b16 in sasview for build_tools

Timestamp:

Sep 11, 2014 1:01:55 PM (10 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4c8a372

Parents:

820df88

Message:

install bumps/periodictable as part of jenkins build for linux/mac

Location:

build_tools

Files:

• jenkins_linux_build.sh (modified) (1 diff)
• jenkins_linux_pylint.sh (modified) (2 diffs)
• jenkins_rhel6_build.sh (modified) (2 diffs)

build_tools/jenkins_linux_build.sh

@@ -15 +15 @@
 rm -rf build
 
-export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview-install:$WORKSPACE/utils
+"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5
+"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0
+
+export PYTHONPATH=$WORKSPACE/sasview-install:$WORKSPACE/utils:$PYTHONPATH
 
 $PYTHON check_packages.py

build_tools/jenkins_linux_pylint.sh

@@ -1 +1 @@
 #! /bin/sh
+set -x
 
 # try to find reasonable settings, if not provided in the environment
@@ -8 +9 @@
 # WORKSPACE top level of source
 
-export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview-install:$WORKSPACE/utils
+export PYTHONPATH=$WORKSPACE/sasview-install:$WORKSPACE/utils:$PYTHONPATH
 
 cd $WORKSPACE
 rm -f test/*.txt
 
-$PYLINT --rcfile $WORKSPACE/build_tools/pylint.rc -f parseable sasview-install/sasview.egg/sans sansview > test/sansview.txt || exit 0
+$PYLINT --rcfile "$WORKSPACE/build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sans sansview > test/sansview.txt || exit 0

build_tools/jenkins_rhel6_build.sh

@@ -12 +12 @@
 export SASVIEW_INSTALL=sasview-install
 
+if [ -z "$EASY_INSTALL" ]; then
+        EASY_INSTALL=`which easy_install`
+fi
+
 
 # Set up build environmentRun tests #######################################
@@ -21 +25 @@
 fi
 export PYTHONPATH=$PYTHONPATH:$WORKSPACE/utils
-easy_install -d $WORKSPACE/utils unittest-xml-reporting
-easy_install -d $WORKSPACE/utils lxml
-easy_install -d $WORKSPACE/utils pyparsing==1.5.5
+"$EASY_INSTALL" -d "$WORKSPACE/utils" unittest-xml-reporting
+"$EASY_INSTALL" -d "$WORKSPACE/utils" lxml
+"$EASY_INSTALL" -d "$WORKSPACE/utils" pyparsing==1.5.5
+"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5
+"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0
 python deps.py