From 2f8847025c51e490d480826dd12dd900a0dd0220 Mon Sep 17 00:00:00 2001
From: Keshav Garg <co16326.ccet@gmail.com>
Date: Sat, 4 Jul 2020 16:09:37 +0530
Subject: [PATCH] travis.yml: Fix the stages

---
 .travis.yml           | 23 +++++++++++++----------
 setup.cfg             |  2 +-
 test-requirements.txt |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 255cb955..aa828846 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
 language: python
 python: 3.6.3
 
-cache:
-  pip: true
+cache: false
 
 stages:
   - test
@@ -10,6 +9,14 @@ stages:
   - name: deploy
     if: type != pull_request
 
+.moban: &moban
+  python: 3.6
+  stage: moban
+  install: pip install moban~=0.5.0 gitfs2 pypifs
+  script:
+    - moban
+    - git diff --exit-code
+
 env:
   global:
     - ENCRYPTION_LABEL: "defac9b1fa56"
@@ -25,13 +32,9 @@ jobs:
     # A proper build with the tokens available
     - stage: deploy
       after_success: ./.ci/deploy.sh
-    - python: 3.6
-      stage: moban
-      env:
-      before_install: false
-      install: pip install moban
-      script: .ci/check_moban.sh
-      after_success: false
+    - *moban
+  allow_failures:
+    - *moban
 
 before_install:
   - printf '%s\n'
@@ -43,7 +46,7 @@ script:
   - ./.ci/build.sh
   - rm -rf private/
   - pytest
-  - coala --non-interactive -V
+  - coala --flush-cache --non-interactive -V
 
 notifications:
   email: false
diff --git a/setup.cfg b/setup.cfg
index 4087933a..00d68aad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ addopts =
   --color=yes
   --doctest-glob=*.rst
   --doctest-modules
-  --doctest-ignore-import-error
+  --doctest-ignore-import-errors
   --error-for-skips
   --cov
   --instafail
diff --git a/test-requirements.txt b/test-requirements.txt
index 4b444785..95ee77da 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,7 +13,7 @@ codecov~=2.0.5
 moban~=0.5.0 ; python_version > '3.0'
 packaging~=16.8
 pytest~=3.6.4
-pytest-cov~=2.4
+pytest-cov==2.4
 pytest-django~=3.3.3
 pytest-env~=0.6.0
 pytest-error-for-skips~=1.0