john-bodley closed pull request #4828: [travis] Fixing environments

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 0fc30037e9..7398cf832b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,12 @@ cache:
   - pip
   - TOXENV=javascript
-  - TOXENV=py27-flake8
+  - TOXENV=flake8
   - TOXENV=py27-mysql
   - TOXENV=py27-sqlite
-  - TOXENV=py27-pylint
-  - TOXENV=py34-flake8
   - TOXENV=py34-postgres
-  - TOXENV=py34-pylint
   - TOXENV=py34-sqlite
+  - TOXENV=pylint
   - mysql -u root -e "DROP DATABASE IF EXISTS superset; CREATE DATABASE 
superset DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"
   - mysql -u root -e "CREATE USER 'mysqluser'@'localhost' IDENTIFIED BY 
diff --git a/superset/ b/superset/
index b1502d83e5..5e6042dc46 100644
--- a/superset/
+++ b/superset/
@@ -746,7 +746,7 @@ def get_data(self, df):
         start = utils.parse_human_datetime(form_data.get('since'))
         end = utils.parse_human_datetime(form_data.get('until'))
         if not start or not end:
-            raise Exception("Please provide both time bounds (Since and 
+            raise Exception('Please provide both time bounds (Since and 
         domain = form_data.get('domain_granularity')
         diff_delta = rdelta.relativedelta(end, start)
         diff_secs = (end - start).total_seconds()
diff --git a/tests/ b/tests/
index 19367cfffa..94632b1e40 100644
--- a/tests/
+++ b/tests/
@@ -7,10 +7,10 @@
 import textwrap
 from sqlalchemy.engine.url import make_url
-from tests.base_tests import SupersetTestCase
 from superset import db
 from superset.models.core import Database
+from .base_tests import SupersetTestCase
 class DatabaseModelTestCase(SupersetTestCase):
diff --git a/tests/ b/tests/
index cec5464989..1762dc863a 100644
--- a/tests/
+++ b/tests/
@@ -10,10 +10,9 @@
 from mock import Mock, patch
 import pandas as pd
-from tests.utils import load_fixture
 from superset.utils import DTTM_ALIAS
 import superset.viz as viz
+from .utils import load_fixture
 class BaseVizTestCase(unittest.TestCase):


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:

With regards,
Apache Git Services

Reply via email to