From 7c9fbb89de0b6c1a8bea12155e8dbd7035c1d48e Mon Sep 17 00:00:00 2001 From: Chris Warrick Date: Sun, 22 Jan 2017 12:09:49 +0100 Subject: [PATCH] Ignore matplotlib for tests Signed-off-by: Chris Warrick --- .travis.yml | 2 +- v7/pyplots/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6fa6a36..a4f71ac0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - "if [[ $NMODE == 'nikola' ]]; then unzip $(./getpyver.py).zip; fi" - "if [[ $NMODE == 'nikola' ]]; then pip install --use-wheel --no-index --find-links=wheelhouse-$(./getpyver.py short) lxml Pillow ipykernel notebook PyYAML; fi" - "if [[ $NMODE == 'nikola' ]]; then pip install git+https://github.com/getnikola/nikola.git#egg=Nikola; fi" - - "if [[ $NMODE == 'nikola' ]]; then find v7 -not -path v7/wiki/requirements.txt -not -path v7/slimish/requirements.txt -not -path v7/import_tumblr/requirements.txt -name requirements.txt -not -path v7/spell_check/requirements.txt | xargs cat | sort | uniq | xargs pip install && true; fi" + - "if [[ $NMODE == 'nikola' ]]; then find v7 -not -path v7/wiki/requirements.txt -not -path v7/slimish/requirements.txt -not -path v7/import_tumblr/requirements.txt -name requirements.txt -not -path v7/spell_check/requirements.txt -not -path v7/pyplots/requirements.txt | xargs cat | sort | uniq | xargs pip install && true; fi" - "if [[ $NMODE == 'flake8' ]]; then pip install flake8; fi" script: - "if [[ $NMODE == 'nikola' ]]; then py.test tests/; fi" diff --git a/v7/pyplots/requirements.txt b/v7/pyplots/requirements.txt index 8915eeb4..f6d2e6ef 100644 --- a/v7/pyplots/requirements.txt +++ b/v7/pyplots/requirements.txt @@ -1,2 +1,2 @@ -matplotlib<2.0.0; python_version <= '3.3' -matplotlib; python_version != '3.3' +matplotlib<2.0.0 ; python_version <= '3.3' +matplotlib ; python_version != '3.3'