Skip to content

Commit 67e931e

Browse files
committed
Use diffpy channel for conda build in travis.
Also execute tests in an empty directory - this speeds up codecov scan for test results. Also install diffpy.Structure when testing on Linux.
1 parent acf3d62 commit 67e931e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Diff for: .travis.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ branches:
2929
addons:
3030
apt:
3131
packages:
32+
- python-dev
3233
- python-numpy
3334
- python-setuptools
35+
- build-essential
3436

3537
before_install:
3638
- umask 022
@@ -53,6 +55,7 @@ before_install:
5355
esac
5456

5557
- mkdir -p ~/pkgs/
58+
- mkdir -p ~/rundir/
5659

5760
- $NOMC || pushd ~/pkgs/
5861
- $NOMC || wget --timestamping ${MYMCREPO}/${MYMCBUNDLE}
@@ -61,9 +64,8 @@ before_install:
6164
- $NOMC || export PATH="${HOME}/mc/bin:${PATH}"
6265
- $NOMC || conda update --yes conda
6366
- $NOMC || conda install --yes conda-build jinja2
64-
- $NOMC || conda config --add channels pavoljuhas/channel/dev
65-
- $NOMC || conda config --add channels pavoljuhas
6667
- $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
68+
- $NOMC || conda config --add channels diffpy
6769

6870
- $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
6971
- $NOAPT || devutils/makesdist
@@ -78,9 +80,10 @@ install:
7880
diffpy.structure pyobjcryst diffpy.srreal srfit-sasview
7981

8082
- $NOAPT || pip install $MYPIPFLAGS coverage
83+
- $NOAPT || easy_install --user diffpy.Structure
8184
- $NOAPT || easy_install --user "${MYTARBUNDLE}"
8285

83-
- cd
86+
- cd ~/rundir
8487
- MYGIT_REV=$(python -c "import diffpy.srfit.version as v; print(v.__gitsha__)")
8588
- if [[ "${TRAVIS_COMMIT}" != "${MYGIT_REV}" ]]; then
8689
echo "Version mismatch ${TRAVIS_COMMIT} vs ${MYGIT_REV}.";

0 commit comments

Comments
 (0)