8
8
- osx
9
9
10
10
env :
11
- global :
12
- - MYPYTHON_VERSION=2.7
13
- matrix :
14
- - MYUSEMC=true
15
- - MYUSEMC=false
11
+ - MYUSEMC=true MYPYTHON_VERSION=2.6
12
+ - MYUSEMC=true MYPYTHON_VERSION=2.7
13
+ - MYUSEMC=false
16
14
17
15
matrix :
18
16
exclude :
@@ -52,32 +50,32 @@ before_install:
52
50
esac
53
51
54
52
- mkdir -p ~/pkgs/
53
+ - mkdir -p ~/rundir/
55
54
56
55
- $NOMC || pushd ~/pkgs/
57
56
- $NOMC || wget --timestamping ${MYMCREPO}/${MYMCBUNDLE}
58
57
- $NOMC || test -x ~/mc/bin/conda || bash ${MYMCBUNDLE} -b -f -p ~/mc
59
58
- $NOMC || popd
60
59
- $NOMC || export PATH="${HOME}/mc/bin:${PATH}"
61
60
- $NOMC || conda update --yes conda
62
- - $NOMC || conda install --yes python=${MYPYTHON_VERSION} conda-build jinja2
61
+ - $NOMC || conda install --yes conda-build jinja2
63
62
- $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
64
- - $NOMC || conda config --add channels pavoljuhas/channel/dev
65
- - $NOMC || conda config --add channels pavoljuhas
63
+ - $NOMC || conda config --add channels diffpy
66
64
67
65
- $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
68
66
- $NOAPT || devutils/makesdist
69
67
- $NOAPT || MYTARBUNDLE="$(ls -t "${PWD}"/dist/*.tar.gz | head -1)"
70
68
71
69
install :
72
- - $NOMC || conda build conda-recipe
70
+ - $NOMC || CONDA_PY=${MYPYTHON_VERSION} conda build conda-recipe
73
71
- $NOMC || conda list --name=_test --export diffpy.structure > /tmp/mypackage.txt
74
72
- $NOMC || source activate testenv
75
73
- $NOMC || conda install --yes --use-local --file=/tmp/mypackage.txt
76
74
77
75
- $NOAPT || pip install $MYPIPFLAGS coverage
78
76
- $NOAPT || easy_install --user "${MYTARBUNDLE}"
79
77
80
- - cd
78
+ - cd ~/rundir
81
79
- MYGIT_REV=$(python -c "import diffpy.Structure.version as v; print(v.__gitsha__)")
82
80
- if [[ "${TRAVIS_COMMIT}" != "${MYGIT_REV}" ]]; then
83
81
echo "Version mismatch ${TRAVIS_COMMIT} vs ${MYGIT_REV}.";
@@ -89,4 +87,7 @@ script:
89
87
90
88
after_success :
91
89
- pip install $MYPIPFLAGS codecov
90
+ - $NOMC || if [[ "${MYPYTHON_VERSION}" == 2.6 ]]; then
91
+ conda install --yes argparse;
92
+ fi
92
93
- codecov
0 commit comments