Skip to content

Commit af8964e

Browse files
committed
DEV: use common root-environment scons in travis.
scons-driven builds for Python 3 need scons from another (root) environment, because scons is so far only available for Python 2.
1 parent ca4cae6 commit af8964e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: .travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ before_install:
5959
- $NOMC || popd
6060
- $NOMC || export PATH="${HOME}/mc/bin:${PATH}"
6161
- $NOMC || conda update --yes conda
62-
- $NOMC || conda install --yes conda-build jinja2
62+
- $NOMC || conda install --yes conda-build jinja2 scons
63+
# Make scons available globally.
64+
- $NOMC || mkdir -p ~/bin
65+
- $NOMC || cp ~/mc/bin/scons ~/bin/
6366
- $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
6467
- $NOMC || conda config --add channels diffpy
6568

Diff for: conda-recipe/meta.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ source:
99
git_url: ..
1010

1111
build:
12-
#preserve_egg_dir: True
13-
1412
# If this is a new build for the same version, increment the build
1513
# number. If you do not include this key, it defaults to 0.
1614
number: 0
@@ -22,7 +20,6 @@ requirements:
2220
- numpy 1.9.2
2321
- libobjcryst 2015.1.*
2422
- boost-all 1.59.0
25-
- scons
2623

2724
run:
2825
- python

0 commit comments

Comments
 (0)