Commit 81ffd0d John Bodley
committed
1 parent 2900ca3 commit 81ffd0d Copy full SHA for 81ffd0d
File tree 5 files changed +36
-16
lines changed
5 files changed +36
-16
lines changed Original file line number Diff line number Diff line change 1
1
language : python
2
+ python :
3
+ - 2.7
4
+ - 3.6
2
5
services :
3
- - mysql
4
- - postgres
5
- - redis-server
6
+ - mysql
7
+ - postgres
8
+ - redis-server
6
9
cache :
7
10
- 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
16
34
before_script :
17
35
- mysql -u root -e "DROP DATABASE IF EXISTS superset; CREATE DATABASE superset DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"
18
36
- 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.
7
7
8
8
* [ 4565] ( https://github.com/apache/incubator-superset/pull/4565 )
9
9
* [ 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():
104
104
),
105
105
classifiers = [
106
106
'Programming Language :: Python :: 2.7' ,
107
- 'Programming Language :: Python :: 3.4' ,
108
107
'Programming Language :: Python :: 3.5' ,
108
+ 'Programming Language :: Python :: 3.6' ,
109
109
],
110
110
)
Original file line number Diff line number Diff line change @@ -312,7 +312,7 @@ def update_datasources_cache():
312
312
database .all_table_names (force = True )
313
313
database .all_view_names (force = True )
314
314
except Exception as e :
315
- print ('{}' .format (e . message ))
315
+ print ('{}' .format (str ( e ) ))
316
316
317
317
318
318
@manager .option (
Original file line number Diff line number Diff line change @@ -37,8 +37,8 @@ setenv =
37
37
SUPERSET_HOME = {envtmpdir}
38
38
py27-mysql: SUPERSET__SQLALCHEMY_DATABASE_URI = mysql://mysqluser:mysqluserpassword@localhost/superset?charset =utf8
39
39
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
42
42
whitelist_externals =
43
43
npm
44
44
@@ -79,6 +79,7 @@ envlist =
79
79
flake8
80
80
javascript
81
81
py27
82
- py34
82
+ py35
83
+ py36
83
84
pylint
84
85
skipsdist = true
You can’t perform that action at this time.
0 commit comments