@@ -70,24 +70,16 @@ before_install:
7070 which python; exit 1)
7171 - $NOAPT || sudo apt-get update -qq
7272 - $NOAPT || sudo apt-get install -y
73- libgsl0-dev libboost-all-dev python-dev
74- python-setuptools python-numpy python-pyparsing
75- python-lxml python-pip build-essential scons
73+ python-dev python-setuptools python-numpy
74+ build-essential
7675
7776 - $NOBREW || test "${TRAVIS_OS_NAME}" = "osx" || exit $?
7877 - $NOBREW || brew update
7978 - $NOBREW || brew upgrade python
8079 - $NOBREW || brew install gcc || brew link --overwrite gcc
81- - $NOBREW || brew install boost-python3
82- - $NOBREW || brew install gsl
83- - $NOBREW || brew install scons
8480
8581 - $NOSYS || devutils/makesdist
8682 - $NOSYS || MYTARBUNDLE="$(ls -t "${PWD}"/dist/*.tar.gz | head -1)"
87- - $NOSYS || pushd ~/pkgs
88- - $NOSYS || git clone https://github.com/diffpy/libobjcryst.git
89- - $NOSYS || git clone https://github.com/diffpy/libdiffpy.git
90- - $NOSYS || popd
9183
9284
9385install :
@@ -100,17 +92,9 @@ install:
10092 - $NOMC || conda install --yes
10193 diffpy.structure pyobjcryst diffpy.srreal
10294
103- - MYSUDO=
104- - $NOAPT || MYSUDO=sudo
10595 - $NOSYS || $MYPIP install $MYPIPFLAGS coverage
106- - $NOSYS || $MYPIP install $MYPIPFLAGS periodictable
10796 - $NOSYS || $MYPIP install $MYPIPFLAGS pycifrw
10897 - $NOSYS || $MYPIP install $MYPIPFLAGS diffpy.structure
109- - $NOSYS || $MYSUDO scons -C ~/pkgs/libobjcryst install
110- - $NOSYS || $MYPIP install $MYPIPFLAGS pyobjcryst
111- - $NOSYS || $MYSUDO scons -C ~/pkgs/libdiffpy install
112- - $NOSYS || $MYPIP install $MYPIPFLAGS diffpy.srreal
113-
11498 - $NOSYS || $MYPIP install $MYPIPFLAGS "${MYTARBUNDLE}"
11599
116100 - cd ${MYRUNDIR}
0 commit comments