[setup] Dropping 3.4 and adding 3.6 (#4835)

* [setup] Dropping 3.4 and 3.6

* Update tox.ini

* Update .travis.yml
This commit is contained in:
John Bodley 2018-04-17 21:30:12 -07:00 committed by GitHub
parent c0db6dbb57
commit 44c2d5bdab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 17 deletions

View File

@ -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';"

View File

@ -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)

View File

@ -104,7 +104,7 @@ setup(
),
classifiers=[
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
)

View File

@ -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(

View File

@ -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