File tree Expand file tree Collapse file tree 5 files changed +34
-17
lines changed
Expand file tree Collapse file tree 5 files changed +34
-17
lines changed Original file line number Diff line number Diff line change 11language : python
2+ python :
3+ - 2.7
4+ - 3.6
25services :
3- - mysql
4- - postgres
5- - redis-server
6+ - mysql
7+ - postgres
8+ - redis-server
69cache :
710 - pip
8- env :
9- - TOXENV=javascript
10- - TOXENV=flake8
11- - TOXENV=py27-mysql
12- - TOXENV=py27-sqlite
13- - TOXENV=py34-postgres
14- - TOXENV=py34-sqlite
15- - TOXENV=pylint
11+ matrix :
12+ include :
13+ - python : 2.7
14+ env : TOXENV=flake8
15+ - python : 2.7
16+ env : TOXENV=py27-mysql
17+ - python : 2.7
18+ env : TOXENV=py27-sqlite
19+ - python : 2.7
20+ env : TOXENV=pylint
21+ - python : 3.6
22+ env : TOXENV=flake8
23+ - python : 3.6
24+ env : TOXENV=javascript
25+ - python : 3.6
26+ env : TOXENV=py36-postgres
27+ - python : 3.6
28+ env : TOXENV=py36-sqlite
29+ - python : 3.6
30+ env : TOXENV=pylint
31+ exclude :
32+ - python : 2.7
33+ - python : 3.6
1634before_script :
1735 - mysql -u root -e "DROP DATABASE IF EXISTS superset; CREATE DATABASE superset DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"
1836 - mysql -u root -e "CREATE USER 'mysqluser'@'localhost' IDENTIFIED BY 'mysqluserpassword';"
Original file line number Diff line number Diff line change @@ -7,3 +7,4 @@ assists people when migrating to a new version.
77
88* [ 4565] ( https://github.com/apache/incubator-superset/pull/4565 )
99* [ 4587] ( https://github.com/apache/incubator-superset/pull/4587 )
10+ * [ 4835] ( https://github.com/apache/incubator-superset/pull/4835 )
Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ def get_git_sha():
104104 ),
105105 classifiers = [
106106 'Programming Language :: Python :: 2.7' ,
107- 'Programming Language :: Python :: 3.4' ,
108107 'Programming Language :: Python :: 3.5' ,
108+ 'Programming Language :: Python :: 3.6' ,
109109 ],
110110)
Original file line number Diff line number Diff line change @@ -312,7 +312,7 @@ def update_datasources_cache():
312312 database .all_table_names (force = True )
313313 database .all_view_names (force = True )
314314 except Exception as e :
315- print ('{}' .format (e . message ))
315+ print ('{}' .format (str ( e ) ))
316316
317317
318318@manager .option (
Original file line number Diff line number Diff line change @@ -37,8 +37,8 @@ setenv =
3737 SUPERSET_HOME = {envtmpdir}
3838 py27-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset?charset =utf8
3939 py34-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset
40- {py27,py34 }-postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://postgresuser:pguserpassword@localhost/superset
41- {py27,py34 }-sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db
40+ py{27,34,36 }-postgres: SUPERSET__SQLALCHEMY_DATABASE_URI = postgresql+psycopg2://postgresuser:pguserpassword@localhost/superset
41+ py{27,34,36 }-sqlite: SUPERSET__SQLALCHEMY_DATABASE_URI = sqlite:////{envtmpdir}/superset.db
4242whitelist_externals =
4343 npm
4444
@@ -78,7 +78,5 @@ envlist =
7878 eslint
7979 flake8
8080 javascript
81- py27
82- py34
8381 pylint
8482skipsdist = true
You can’t perform that action at this time.
0 commit comments