Skip to content

Commit fef0281

Browse files
committed
making everything tidy & up-to-date
- updated ci/test.sh with the latest tests (rebase) after merging BristolTopGroup#96 - removed obsolete stuff from ci/install.sh - now installing numpy and cython instead of compiling it (speedup!)
1 parent 13ce815 commit fef0281

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

ci/install.sh

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66

77
set -e
88

9-
# Helper functions
10-
success() {
11-
if [ $1 -eq 0 ];then
12-
echo "Successfully installed $2"
13-
else
14-
echo "Failed to install $2"
15-
fi
16-
}
17-
189
# Check if we are running Python 2 or 3. This is needed for the apt-get package names
1910
if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then
2011
export PYTHON_SUFFIX="3";
@@ -29,7 +20,7 @@ time sudo apt-get update -qq
2920

3021
# Install the dependencies we need
3122
time sudo apt-get -qq install clang-3.5 libclang-3.5-dev gcc-4.8 g++-4.8
32-
time sudo apt-get install -qq python${PYTHON_SUFFIX}-numpy python${PYTHON_SUFFIX}-sphinx python${PYTHON_SUFFIX}-nose python${PYTHON_SUFFIX}-pip
23+
time sudo apt-get install -qq python${PYTHON_SUFFIX}-numpy python${PYTHON_SUFFIX}-sphinx python${PYTHON_SUFFIX}-nose python${PYTHON_SUFFIX}-pip cython${PYTHON_SUFFIX}
3324
# matplotlib and PyTables are not available for Python 3 as packages from the main repo yet.
3425
if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then
3526
time sudo apt-get install -qq python-matplotlib python-tables;
@@ -59,7 +50,8 @@ fi
5950
#DailyPythonTools location
6051
export base=`pwd`
6152

62-
#package list from FinalStateAnalysis (https://github.com/uwcms/FinalStateAnalysis/blob/master/recipe/install_python.sh)
53+
# package list from FinalStateAnalysis
54+
# (https://github.com/uwcms/FinalStateAnalysis/blob/master/recipe/install_python.sh)
6355
echo "Installing yolk"
6456
time sudo pip install -U yolk
6557
echo "Installing ipython"
@@ -70,14 +62,10 @@ echo "Installing uncertainties <-- awesome error propagation"
7062
time sudo pip install -U uncertainties
7163
echo "Install progressbar"
7264
time sudo pip install -U progressbar
73-
echo "Install cython"
74-
time sudo pip install -U cython
7565
echo "Installing argparse"
7666
time sudo pip install -U argparse
7767
echo "Installing pudb <-- interactive debugging"
7868
time sudo pip install -U pudb
79-
#echo "Installing numpy"
80-
#time sudo pip install -U numpy
8169
echo "Installing dateutil"
8270
time sudo pip install python-dateutil
8371
echo "Installing PrettyTable"
@@ -95,7 +83,6 @@ if [ ! -d "$base/external/lib" ]; then
9583
echo "Building RooUnfold"
9684
cd $base/external/RooUnfold/
9785
make -j4
98-
success $? RooUnfold
9986
#remove tmp folder
10087
rm -fr $base/external/RooUnfold/tmp
10188
mv $base/external/RooUnfold/libRooUnfold.so $base/external/lib/.
@@ -106,7 +93,6 @@ if [ ! -d "$base/external/lib" ]; then
10693
echo "Building TopAnalysis"
10794
cd $base/external/TopAnalysis/
10895
make -j4
109-
success $? TopAnalysis
11096
# remove tmp folder
11197
rm -fr $base/external/TopAnalysis/tmp
11298
mv $base/external/TopAnalysis/libTopSVDUnfold.so $base/external/lib/.

ci/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ ls -la /dev/shm
2828
time python test/config_XSectionConfig.py
2929
time python test/cross_section_measurement_00_pick_bins.py
3030
time python test/fix_overflow.py
31-
time python test/RooFitFit.py
32-
time python test/TMinuitFit.py
3331
time python test/tools_Calculation.py
32+
time python test/tools_Fitting_FitData.py
33+
time python test/tools_Fitting_Minuit.py
34+
time python test/tools_Fitting_RooFitFit.p
3435
time python test/tools_hist_utilities.py
3536
time python test/tools_Unfolding.py
3637
time python test/Integral_GetBinContent_consistency.py
37-

0 commit comments

Comments
 (0)