Skip to content

Commit 82daf44

Browse files
committed
Update to latest symengine version
Also change travis installation as conda is used in symengine's bin/install_travis.sh as well.
1 parent 1d3b473 commit 82daf44

File tree

3 files changed

+8
-21
lines changed

3 files changed

+8
-21
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ install:
110110
- export PYTHON_SOURCE_DIR=`pwd`
111111
- export TEST_CPP="no"
112112

113+
# Setup travis for Python wrappers
114+
- source bin/install_travis.sh
115+
113116
- git clone https://github.com/symengine/symengine symengine-cpp
114117
- cd symengine-cpp
115118
- export SOURCE_DIR=`pwd`
@@ -118,12 +121,8 @@ install:
118121
# Setup travis for C++ library
119122
- if [[ "${WITH_SAGE}" != "yes" ]]; then source bin/install_travis.sh; fi
120123

121-
# Setup travis for Python wrappers
122-
- cd $PYTHON_SOURCE_DIR
123-
- source bin/install_travis.sh
124-
125124
# Build C++ library
126-
- cd symengine-cpp
125+
- cd $PYTHON_SOURCE_DIR/symengine-cpp
127126
- bin/test_travis.sh
128127

129128
script:

bin/install_travis.sh

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
#!/usr/bin/env bash
22

33
if [[ "${WITH_SAGE}" != "yes" ]]; then
4-
if [[ "${TRAVIS_OS_NAME}" != "osx" ]]; then
5-
wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
6-
else
7-
wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh;
8-
fi
9-
bash miniconda.sh -b -p $our_install_dir/miniconda;
10-
export PATH="$our_install_dir/miniconda/bin:$PATH";
11-
hash -r;
12-
conda config --set always_yes yes --set changeps1 no;
13-
conda update -q conda;
14-
conda info -a;
15-
CONDA_PKGS="pip cython sympy nose pytest"
4+
# symengine's bin/install_travis.sh will install miniconda
5+
conda_pkgs="python=${PYTHON_VERSION} pip cython sympy nose pytest"
166
if [[ "${WITH_NUMPY}" == "yes" ]]; then
17-
CONDA_PKGS="${CONDA_PKGS} numpy";
7+
conda_pkgs="${conda_pkgs} numpy";
188
fi
19-
conda create -q -n test-environment python="${PYTHON_VERSION}" ${CONDA_PKGS};
20-
source activate test-environment;
219
else
2210
wget -O- https://dl.dropboxusercontent.com/u/46807346/sage-6.9-x86_64-Linux-Ubuntu_12.04_64_bit.tar.gz | tar xz
2311
SAGE_ROOT=`pwd`/sage-6.9-x86_64-Linux

symengine_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c7a3bac9d715d9d78c3005b725c2cf4946514e32
1+
c1cd1adbf15d782bf48048b31428702bef81fbab

0 commit comments

Comments
 (0)