From c3a398ac06164cd7dc1ebd45cf168cefdacc168d Mon Sep 17 00:00:00 2001
From: Daisuke Tanaka <duaipp@gmail.com>
Date: Thu, 10 Jan 2019 13:34:52 +0900
Subject: [PATCH 1/4] use exit option on autopep8 check

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b816b2d..716c3d82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,7 @@ install:
 script:
   # python style check
   - flake8
-  - autopep8 -r . --global-config .pep8 --diff | tee check_autopep8
-  - test ! -s check_autopep8
+  - autopep8 -r . --global-config .pep8 --diff --exit-code
   # frontend style check
   - pushd frontend
   - npm run lint

From 35de1e5e9241b635727ffd770739929aca080925 Mon Sep 17 00:00:00 2001
From: Daisuke Tanaka <duaipp@gmail.com>
Date: Thu, 10 Jan 2019 13:52:01 +0900
Subject: [PATCH 2/4] add plain install job on CI

---
 .travis.yml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 716c3d82..09ac06f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,24 @@
 language: python
-python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
+
+matrix:
+  include:
+    - name: "Ubuntu14.04 Py27"
+      dist: trusty
+      python: "2.7"
+    - name: "Ubuntu16.04 Py35"
+      dist: xenial
+      python: "3.5"
+    - name: "Ubuntu16.04 Py36, plain install"
+      dist: xenial
+      python: "3.6"
+      env:
+        - CHAINERUI_PLAIN_INSTALL=1
+    - name: "Ubuntu16.04 Py36"
+      dist: xenial
+      python: "3.6"
+      env:
+        - CHAINERUI_COVERAGE_REPORT=1
+        - CHAINERUI_DEPLOY_JOB=1
 
 services:
   - docker
@@ -15,7 +31,7 @@ sudo: false
 before_install:
   - pip install autopep8 hacking
   - pip install -U pytest pytest-cov coveralls
-  - pip install Pillow matplotlib scipy chainer
+  - if [[ $CHAINERUI_PLAIN_INSTALL != 1 ]]; then pip install Pillow matplotlib scipy chainer; fi
   - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install mock; fi
   - npm install -g npm@6
   - npm -v
@@ -43,7 +59,7 @@ script:
   - pytest --cov=chainerui
 
 after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then COVERALLS_TOKEN=$COVERALLS_TOKEN coveralls; fi
+  - if [[ $CHAINERUI_COVERAGE_REPORT == 1 ]]; then COVERALLS_TOKEN=$COVERALLS_TOKEN coveralls; fi
 
 deploy:
   - provider: pypi
@@ -51,13 +67,13 @@ deploy:
     password: $PYPI_MAINTAINER_PASS
     on:
       tags: true
-      python: 3.6
+      condition: $CHAINERUI_DEPLOY_JOB == 1
     allow_failure: false
     skip_cleanup: true
   - provider: script
     script: bash .travis/docker_push.sh
     on:
       tags: true
-      python: 3.6
+      condition: $CHAINERUI_DEPLOY_JOB == 1
     allow_failure: false
     skip_cleanup: true

From 1843cfc9d4ff1299c981f8df4f45f8f82facd045 Mon Sep 17 00:00:00 2001
From: Daisuke Tanaka <duaipp@gmail.com>
Date: Thu, 10 Jan 2019 15:45:15 +0900
Subject: [PATCH 3/4] add plain job on appveyor

---
 appveyor.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4085cf90..c215b068 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,8 @@ environment:
     - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
+      CHAINERUI_PLAIN_INSTALL: 1
+    - PYTHON: "C:\\Python36-x64"
 
 install:
   - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
@@ -12,7 +14,7 @@ install:
   - pip --version
 
   - pip install -U pytest pytest-cov mock
-  - pip install Pillow matplotlib scipy chainer
+  - if not "%CHAINERUI_PLAIN_INSTALL%"=="1" (pip install Pillow matplotlib scipy chainer)
 
   # Update Node.js
   - ps: Install-Product node $env:nodejs_version

From 9891698afabf0b05405ee57e4008111257a583a8 Mon Sep 17 00:00:00 2001
From: Daisuke Tanaka <duaipp@gmail.com>
Date: Thu, 10 Jan 2019 18:12:20 +0900
Subject: [PATCH 4/4] add numpy install for test

---
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09ac06f9..b3cf2d7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ sudo: false
 before_install:
   - pip install autopep8 hacking
   - pip install -U pytest pytest-cov coveralls
-  - if [[ $CHAINERUI_PLAIN_INSTALL != 1 ]]; then pip install Pillow matplotlib scipy chainer; fi
+  - if [[ $CHAINERUI_PLAIN_INSTALL != 1 ]]; then pip install Pillow matplotlib scipy chainer; else pip install numpy; fi
   - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install mock; fi
   - npm install -g npm@6
   - npm -v
diff --git a/appveyor.yml b/appveyor.yml
index c215b068..3282f9e2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ install:
   - pip --version
 
   - pip install -U pytest pytest-cov mock
-  - if not "%CHAINERUI_PLAIN_INSTALL%"=="1" (pip install Pillow matplotlib scipy chainer)
+  - if "%CHAINERUI_PLAIN_INSTALL%"=="1" (pip install numpy) else (pip install Pillow matplotlib scipy chainer)
 
   # Update Node.js
   - ps: Install-Product node $env:nodejs_version