Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[travis] Fixing environments #4828

Merged
merged 1 commit into from
Apr 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ cache:
- pip
env:
- 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
before_script:
- 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 'mysqluserpassword';"
Expand Down
2 changes: 1 addition & 1 deletion superset/viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 Until)")
raise Exception('Please provide both time bounds (Since and Until)')
domain = form_data.get('domain_granularity')
diff_delta = rdelta.relativedelta(end, start)
diff_secs = (end - start).total_seconds()
Expand Down
2 changes: 1 addition & 1 deletion tests/model_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions tests/viz_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down