From 15986ee17771f131c75e5ce51a19287fe7c6a873 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Tue, 8 Mar 2016 13:46:04 -0500 Subject: [PATCH 1/3] tests: Update failure message for recursive build. --- tests/test-recipes/build_recipes.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test-recipes/build_recipes.sh b/tests/test-recipes/build_recipes.sh index e32ce6b924..01b2afbc0f 100755 --- a/tests/test-recipes/build_recipes.sh +++ b/tests/test-recipes/build_recipes.sh @@ -32,7 +32,8 @@ echo "$OUTPUT" | grep "Error" | wc -l | grep 6 echo "$OUTPUT" | grep 'Error: Untracked file(s) ('\''conda-meta/nope'\'',)' ! OUTPUT=$(conda build --no-anaconda-upload recursive-build/ 2>&1) -echo "$OUTPUT" | grep 'No packages found in current .* channels matching: recursive-build2 2\.0' +echo "$OUTPUT" | tail -n2 | head -n1 | grep 'Error: Package missing in current .* channels: ' +echo "$OUTPUT" | tail -n1 | grep ' - recursive-build2 2.0' ! OUTPUT=$(conda build --no-anaconda-upload source_git_jinja2_oops/ 2>&1) echo "$OUTPUT" | grep '\''GIT_DSECRIBE_TAG'\'' is undefined' From f85dcdb1b511ffd059992133d1ad2adb35a9375a Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Tue, 8 Mar 2016 14:16:31 -0500 Subject: [PATCH 2/3] travis: Fix testing on Python 3.3. --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a18bbc0009..8647ec7f9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,11 @@ install: - export PATH="$HOME/miniconda/bin:$PATH" - hash -r - conda config --set always_yes yes - - conda install --force --no-deps conda requests + - if [[ "$TRAVIS_PYTHON_VERSION" == "3.3" ]]; then + conda install --force --no-deps 'conda=3.*' requests; + else + conda install --force --no-deps conda requests; + fi - conda install pip pytest requests jinja2 patchelf pyflakes python=$TRAVIS_PYTHON_VERSION - pip install pytest-cov - python setup.py install From 7c2408f60417298a0cafc719b401f04486964d94 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Tue, 8 Mar 2016 14:31:03 -0500 Subject: [PATCH 3/3] tests: Add a workaround for conda 3. --- tests/test-recipes/build_recipes.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/test-recipes/build_recipes.sh b/tests/test-recipes/build_recipes.sh index 01b2afbc0f..047daa269b 100755 --- a/tests/test-recipes/build_recipes.sh +++ b/tests/test-recipes/build_recipes.sh @@ -31,9 +31,19 @@ echo "$OUTPUT" | grep "Error" | wc -l | grep 6 ! OUTPUT=$(conda build --no-anaconda-upload conda-meta/ 2>&1) echo "$OUTPUT" | grep 'Error: Untracked file(s) ('\''conda-meta/nope'\'',)' +# Get the version of conda as the error message changed in conda 4. +set +e +echo $(conda -V 2>&1) | grep "conda 3\..*" +export IS_CONDA_3=$? +set -e + ! OUTPUT=$(conda build --no-anaconda-upload recursive-build/ 2>&1) -echo "$OUTPUT" | tail -n2 | head -n1 | grep 'Error: Package missing in current .* channels: ' -echo "$OUTPUT" | tail -n1 | grep ' - recursive-build2 2.0' +if [[ $IS_CONDA_3 -eq 0 ]]; then + echo "$OUTPUT" | grep 'No packages found in current .* channels matching: recursive-build2 2\.0' +else + echo "$OUTPUT" | tail -n2 | head -n1 | grep 'Error: Package missing in current .* channels: ' + echo "$OUTPUT" | tail -n1 | grep ' - recursive-build2 2.0' +fi ! OUTPUT=$(conda build --no-anaconda-upload source_git_jinja2_oops/ 2>&1) echo "$OUTPUT" | grep '\''GIT_DSECRIBE_TAG'\'' is undefined'