only limit py3.5 when running on travis

Zulko · Mar 14, 2017 · 1bd252d · 1bd252d
1 parent 7b336b4
commit 1bd252d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -2,19 +2,23 @@
 from moviepy.editor import *
 import moviepy.video.tools.cuts as cuts
 
+import os
 import sys
 sys.path.append("tests")
 import download_media
-from test_helper import PYTHON_VERSION, TMP_DIR
+from test_helper import PYTHON_VERSION, TMP_DIR, TRAVIS
 
 def test_download_media(capsys):
     with capsys.disabled():
        download_media.download()
 
 def test_matplotlib():
+    if PYTHON_VERSION in ('2.7', '3.3'):
+       return
+
     #for now, python 3.5 installs a version of matplotlib that complains
     #about $DISPLAY variable, so lets just ignore for now.
-    if PYTHON_VERSION in ('2.7', '3.3', '3.5'):
+    if PYTHON_VERSION == '3.5' and TRAVIS:
        return
 
     import matplotlib.pyplot as plt

diff --git a/tests/test_issues.py b/tests/test_issues.py
@@ -10,7 +10,7 @@
 import sys
 sys.path.append("tests")
 import download_media
-from test_helper import PYTHON_VERSION, TMP_DIR
+from test_helper import PYTHON_VERSION, TMP_DIR, TRAVIS
 
 def test_download_media(capsys):
     with capsys.disabled():
@@ -48,7 +48,11 @@ def test_issue_359():
 
 def test_issue_368():
     import sys
-    if PYTHON_VERSION in ('2.7', '3.3', '3.5'): #matplotlib only supported in python >= 3.4
+    if PYTHON_VERSION in ('2.7', '3.3'): #matplotlib only supported in python >= 3.4
+       return
+
+    #travis, python 3.5 matplotlib version has problems..
+    if PYTHON_VERSION == '3.5' and TRAVIS:
        return
 
     import numpy as np