john-bodley closed pull request #4835: [setup] Dropping 3.4 and adding 3.6 URL: https://github.com/apache/incubator-superset/pull/4835
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 7398cf832b..16cdbb35bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,36 @@ language: python +python: + - 2.7 + - 3.6 services: - - mysql - - postgres - - redis-server + - mysql + - postgres + - redis-server cache: - pip -env: - - TOXENV=javascript - - TOXENV=flake8 - - TOXENV=py27-mysql - - TOXENV=py27-sqlite - - TOXENV=py34-postgres - - TOXENV=py34-sqlite - - TOXENV=pylint +matrix: + include: + - python: 2.7 + env: TOXENV=flake8 + - python: 2.7 + env: TOXENV=py27-mysql + - python: 2.7 + env: TOXENV=py27-sqlite + - python: 2.7 + env: TOXENV=pylint + - python: 3.6 + env: TOXENV=flake8 + - python: 3.6 + env: TOXENV=javascript + - python: 3.6 + env: TOXENV=py36-postgres + - python: 3.6 + env: TOXENV=py36-sqlite + - python: 3.6 + env: TOXENV=pylint + exclude: + - python: 2.7 + - python: 3.6 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';" diff --git a/UPDATING.md b/UPDATING.md index e18409f89d..9a8b9b83df 100644 --- a/UPDATING.md +++ b/UPDATING.md @@ -7,3 +7,4 @@ assists people when migrating to a new version. * [4565](https://github.com/apache/incubator-superset/pull/4565) * [4587](https://github.com/apache/incubator-superset/pull/4587) +* [4835](https://github.com/apache/incubator-superset/pull/4835) diff --git a/setup.py b/setup.py index c24d6f2bc5..2445703a00 100644 --- a/setup.py +++ b/setup.py @@ -104,7 +104,7 @@ def get_git_sha(): ), classifiers=[ 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', ], ) diff --git a/superset/cli.py b/superset/cli.py index a40f062968..6321b5f18d 100755 --- a/superset/cli.py +++ b/superset/cli.py @@ -312,7 +312,7 @@ def update_datasources_cache(): database.all_table_names(force=True) database.all_view_names(force=True) except Exception as e: - print('{}'.format(e.message)) + print('{}'.format(str(e))) @manager.option( diff --git a/tox.ini b/tox.ini index fba53956ac..d942be1fb1 100644 --- a/tox.ini +++ b/tox.ini @@ -37,8 +37,8 @@ setenv = SUPERSET_HOME = {envtmpdir} py27-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset?charset=utf8 py34-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset - {py27,py34}-postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://postgresuser:pguserpassword@localhost/superset - {py27,py34}-sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db + py{27,34,36}-postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://postgresuser:pguserpassword@localhost/superset + py{27,34,36}-sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db whitelist_externals = npm @@ -78,7 +78,5 @@ envlist = eslint flake8 javascript - py27 - py34 pylint skipsdist = true ---------------------------------------------------------------- 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: [email protected] With regards, Apache Git Services
