Skip to content

Commit

Permalink
[setup] Dropping 3.4 and adding 3.6 (apache#4835)
Browse files Browse the repository at this point in the history
* [setup] Dropping 3.4 and 3.6

* Update tox.ini

* Update .travis.yml
  • Loading branch information
john-bodley authored and michellethomas committed May 23, 2018
1 parent 6d2b5a3 commit 529225e
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 17 deletions.
40 changes: 29 additions & 11 deletions .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';"
Expand Down
1 change: 1 addition & 0 deletions UPDATING.md
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -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',
],
)
2 changes: 1 addition & 1 deletion superset/cli.py
Expand Up @@ -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(
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Expand Up @@ -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

Expand Down Expand Up @@ -78,7 +78,5 @@ envlist =
eslint
flake8
javascript
py27
py34
pylint
skipsdist = true

0 comments on commit 529225e

Please sign in to comment.