Merge pull request apache#122 from graceguo-supercat/apache_sync_october

Apache sync october

.gitignore

@@ -1,43 +1,52 @@
+*.bak
+*.db
 *.pyc
-yarn-error.log
-_modules
-superset/assets/coverage/*
-changelog.sh
-.DS_Store
+*.sqllite
+*.swp
 .coverage
+.DS_Store
+.eggs
+.idea
+.python-version
+.tox
+.vscode
 _build
-_static
 _images
 _modules
-superset/bin/supersetc
+_static
+build
+app.db
+changelog.sh
+dist
+dump.rdb
+env
 env_py3
 envpy3
-.eggs
-build
-*.db
-tmp
-superset_config.py
 local_config.py
-env
-dist
+superset_config.py
 superset.egg-info/
-app.db
-*.bak
-.idea
-*.sqllite
-.vscode
-.python-version
-.tox
-dump.rdb
+superset/bin/supersetc
+tmp
 
 # Node.js, webpack artifacts
 *.entry.js
 *.js.map
 node_modules
 npm-debug.log*
+superset/assets/coverage/*
+superset/assets/cypress/screenshots
+superset/assets/cypress/videos
 superset/assets/version_info.json
+yarn-error.log
 
 # IntelliJ
 *.iml
 venv
 @eaDir/
+
+# docker
+/Dockerfile
+/docker-build.sh
+/docker-compose.yml
+/docker-entrypoint.sh
+/docker-init.sh

.pylintrc

@@ -23,7 +23,7 @@ persistent=yes
 load-plugins=
 
 # Use multiple processes to speed up Pylint.
-jobs=1
+jobs=2
 
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.

.travis.yml

@@ -1,42 +1,61 @@
-language: python
-python:
-  - 2.7
-  - 3.6
-services:
-  - mysql
-  - postgres
-  - redis-server
 cache:
-  - pip
-matrix:
+  pip: true
+jobs:
   include:
-    - python: 2.7
+    - language: python
+      python: 3.6
+      env: TOXENV=cypress
+      cache:
+        pip: true
+        yarn: true
+        directories:
+          - ~/.npm
+          - ~/.cache
+      services:
+        - redis-server
+      before_install:
+        - nvm install 8.9
+    - language: python
+      python: 3.6
+      env: TOXENV=py36-mysql
+      services:
+        - mysql
+        - redis-server
+      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';"
+        - mysql -u root -e "GRANT ALL ON superset.* TO 'mysqluser'@'localhost';"
+    - language: node_js
+      node_js: 8.9
+      cache:
+        yarn: true
+      before_install:
+        - cd superset/assets
+      install:
+        - yarn install --frozen-lockfile
+      script:
+        - npm run lint
+        - npm run cover
+    - language: python
+      python: 3.6
       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
+    - language: python
+      python: 3.6
       env: TOXENV=py36-sqlite
-    - python: 3.6
+      services:
+        - redis-server
+    - language: python
+      python: 3.6
+      env: TOXENV=py36-postgres
+      services:
+        - postgres
+        - redis-server
+      before_script:
+        - psql -U postgres -c "CREATE DATABASE superset;"
+        - psql -U postgres -c "CREATE USER postgresuser WITH PASSWORD 'pguserpassword';"
+    - language: python
+      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';"
-  - mysql -u root -e "GRANT ALL ON superset.* TO 'mysqluser'@'localhost';"
-  - psql -U postgres -c "CREATE DATABASE superset;"
-  - psql -U postgres -c "CREATE USER postgresuser WITH PASSWORD 'pguserpassword';"
 install:
   - pip install --upgrade pip
   - pip install codecov tox