update test matrix

Author: sheppard

.travis.yml

@@ -1,24 +1,57 @@
 language: python
-sudo: false
-python:
- - "2.7"
- - "3.4"
- - "3.5"
- - "3.6"
+dist: xenial
 env:
-  matrix:
-    - DJANGO="django==1.8.18"
-    - DJANGO="django==1.10.7"
-    - DJANGO="django==1.11.4"
-    - DJANGO="django==1.11.4" LINT=1
   global:
-    - REST="djangorestframework==3.6.4"
-    - PANDAS="pandas==0.20.3"
+    - DJANGO="django==2.1.7"
+    - REST="djangorestframework==3.9.1"
+    - PANDAS="pandas==0.24.1"
+matrix:
+  include:
+    - python: "2.7"
+      name: "Python 2.7 (Django 1.8)"
+      env:
+        - DJANGO="django==1.8.19"
+        - REST="djangorestframework==3.6.4"
+    - python: "3.5"
+      name: "Python 3.5 (Django 1.8)"
+      env:
+        - DJANGO="django==1.8.19"
+        - REST="djangorestframework==3.6.4"
+    - python: "2.7"
+      name: "Python 2.7 (Django 1.11)"
+      env:
+        - DJANGO="django==1.11.20"
+    - python: "3.7"
+      name: "Python 3.7 (Django 1.11)"
+      env:
+        - DJANGO="django==1.11.20"
+    - python: "3.4"
+      name: "Python 3.4"
+      env:
+        - DJANGO="django==2.0.13"
+    - python: "3.5"
+      name: "Python 3.5"
+      env: []
+    - python: "3.6"
+      name: "Python 3.6"
+      env: []
+    - python: "3.7"
+      name: "Python 3.7"
+      env: []
+    - python: "3.7"
+      name: "Python 3.7 + matplotlib"
+      env:
+        - MATPLOTLIB="matplotlib"
+    - python: "3.7"
+      name: "Python 3.7 + django-pandas"
+      env:
+        - DJPANDAS="django-pandas"
+    - python: "3.7"
+      name: "Code Lint"
+      env:
+        - LINT="flake8"
 install:
  - pip install --upgrade pip
- - pip install $DJANGO $REST $PANDAS
- - pip install matplotlib
- - pip install flake8
- - pip install django-pandas
+ - pip install $DJANGO $REST $PANDAS $MATPLOTLIB $DJPANDAS $LINT
 script:
  - ./runtests.sh

setup.py

@@ -56,8 +56,7 @@ def readme():
     ],
     test_suite='tests',
     tests_require=[
-        'wq.io', 'xlwt', 'openpyxl', 'matplotlib',
-        'django', 'django-mustache'
+        'wq.io', 'xlwt', 'openpyxl', 'django', 'django-mustache'
     ],
     setup_requires=[
         'setuptools_scm',

tests/settings.py

@@ -18,3 +18,19 @@
         'APP_DIRS': True,
     },
 ]
+
+
+try:
+    import matplotlib
+except ImportError:
+    HAS_MATPLOTLIB = False
+else:
+    HAS_MATPLOTLIB = True
+
+
+try:
+   import django_pandas
+except ImportError:
+    HAS_DJANGO_PANDAS = False
+else:
+    HAS_DJANGO_PANDAS = True

tests/test_complex.py

@@ -1,6 +1,8 @@
+import unittest
 from rest_framework.test import APITestCase
 from tests.testapp.models import ComplexTimeSeries
 from rest_pandas.test import parse_csv
+from .settings import HAS_MATPLOTLIB
 
 
 class ComplexTestCase(APITestCase):
@@ -127,6 +129,7 @@ def test_complex_scatter(self):
                 ]},
         ], datasets)
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_complex_boxplot(self):
         # Default group=series-year
         response = self.client.get("/complexboxplot.csv")
@@ -179,6 +182,7 @@ def test_complex_boxplot(self):
         self.assertEqual(stats['value-mean'], 0.4)
         self.assertEqual(stats['value-whishi'], 0.8)
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_complex_boxplot_series(self):
         response = self.client.get("/complexboxplot.csv?group=series")
         datasets = self.parse_csv(response)
@@ -224,6 +228,7 @@ def test_complex_boxplot_series(self):
         self.assertEqual(stats['value-mean'], 0.4)
         self.assertEqual(stats['value-whishi'], 0.8)
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_complex_boxplot_month_group(self):
         response = self.client.get("/complexboxplot.csv?group=series-month")
         datasets = self.parse_csv(response)
@@ -269,6 +274,7 @@ def test_complex_boxplot_month_group(self):
         self.assertEqual(stats['value-mean'], 0.4)
         self.assertEqual(stats['value-whishi'], 0.8)
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_complex_boxplot_year(self):
         response = self.client.get("/complexboxplot.csv?group=year")
         datasets = self.parse_csv(response)

tests/test_images.py

@@ -1,7 +1,10 @@
+import unittest
 from rest_framework.test import APITestCase
 from tests.testapp.models import TimeSeries
+from .settings import HAS_MATPLOTLIB
 
 
+@unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
 class ImageTestCase(APITestCase):
     def setUp(self):
         data = (

tests/test_multi.py

@@ -1,9 +1,11 @@
+import unittest
 from rest_framework.test import APITestCase
 from tests.testapp.models import MultiTimeSeries
 from tests.testapp.serializers import NotUnstackableSerializer
 from rest_pandas.test import parse_csv
 from django.core.exceptions import ImproperlyConfigured
 import os
+from .settings import HAS_MATPLOTLIB
 
 
 class MultiTestCase(APITestCase):
@@ -70,7 +72,8 @@ def test_multi_series_html(self):
     def test_multi_scatter(self):
         response = self.client.get("/multiscatter.csv")
         self.assertEqual(
-            """date,test1-value,test2-value
+            """,test1-value,test2-value
+            date,,
             2015-01-01,0.5,0.7
             2015-01-02,0.4,0.8
             2015-01-03,0.6,0.0
@@ -80,6 +83,7 @@ def test_multi_scatter(self):
             response.content.decode('utf-8')
         )
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_multi_boxplot(self):
         # Default: group=series-year
         response = self.client.get("/multiboxplot.csv")
@@ -104,6 +108,7 @@ def test_multi_boxplot(self):
         self.assertEqual(round(stats['value-mean'], 8), 0.54)
         self.assertEqual(stats['value-whishi'], 0.9)
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_multi_boxplot_series(self):
         response = self.client.get("/multiboxplot.csv?group=series")
         datasets = self.parse_csv(response)[0]['data']
@@ -125,6 +130,7 @@ def test_multi_boxplot_series(self):
         self.assertEqual(round(stats['value-mean'], 8), 0.54)
         self.assertEqual(stats['value-whishi'], 0.9)
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_multi_boxplot_series_month(self):
         response = self.client.get("/multiboxplot.csv?group=series-month")
 
@@ -148,6 +154,7 @@ def test_multi_boxplot_series_month(self):
         self.assertEqual(round(stats['value-mean'], 8), 0.54)
         self.assertEqual(stats['value-whishi'], 0.9)
 
+    @unittest.skipUnless(HAS_MATPLOTLIB, "requires matplotlib")
     def test_multi_boxplot_year(self):
         response = self.client.get("/multiboxplot.csv?group=year")
 

tests/test_views.py

@@ -1,9 +1,11 @@
+import unittest
 from rest_framework.test import APITestCase
 from tests.testapp.models import TimeSeries, CustomIndexSeries
 from wq.io import load_string
 import json
 import datetime
 import os
+from .settings import HAS_DJANGO_PANDAS
 
 
 class PandasTestCase(APITestCase):
@@ -34,6 +36,7 @@ def test_view_csv_noid(self):
         self.assertEqual(len(data), 5)
         self.assertEqual(data[0].value, '0.5')
 
+    @unittest.skipUnless(HAS_DJANGO_PANDAS, 'requires django-pandas')
     def test_view_django_pandas(self):
         response = self.client.get("/djangopandas.csv")
         data = self.load_string(response)

tests/testapp/models.py

@@ -1,5 +1,8 @@
 from django.db import models
-from django_pandas.managers import DataFrameManager
+try:
+   from django_pandas.managers import DataFrameManager
+except ImportError:
+   DataFrameManager = models.Manager
 
 
 class TimeSeries(models.Model):