From 235a0e948eff1ae28ca0f125af0ee00bf72620ff Mon Sep 17 00:00:00 2001
From: Ines Montani <ines@ines.io>
Date: Sun, 24 Feb 2019 12:07:33 +0100
Subject: [PATCH] Tidy up CI config

---
 .appveyor.yml | 34 ----------------------------------
 .travis.yml   | 18 ++++--------------
 2 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7ace56528..daf4c2457 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,55 +1,21 @@
 environment:
-
   matrix:
-
-    # For Python versions available on Appveyor, see
-    # http://www.appveyor.com/docs/installed-software#python
-
-      #- PYTHON: "C:\\Python27-x64"
-    #- PYTHON: "C:\\Python34"
-    #- PYTHON: "C:\\Python35"
-    #- DISTUTILS_USE_SDK: "1"
-    #- PYTHON: "C:\\Python34-x64"
-    #- DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
     - PYTHON: "C:\\Python37-x64"
-
 install:
   # We need wheel installed to build wheels
   - "%PYTHON%\\python.exe -m pip install wheel"
   - "%PYTHON%\\python.exe -m pip install cython"
   - "%PYTHON%\\python.exe -m pip install -r requirements.txt"
   - "%PYTHON%\\python.exe -m pip install -e ."
-
 build: off
-
 test_script:
-  # Put your test command here.
-  # If you don't need to build C extensions on 64-bit Python 3.4,
-  # you can remove "build.cmd" from the front of the command, as it's
-  # only needed to support those cases.
-  # Note that you must use the environment variable %PYTHON% to refer to
-  # the interpreter you're using - Appveyor does not do anything special
-  # to put the Python version you want to use on PATH.
   - "%PYTHON%\\python.exe -m pytest spacy/ --no-print-logs"
-
 after_test:
-  # This step builds your wheels.
-  # Again, you only need build.cmd if you're building C extensions for
-  # 64-bit Python 3.4. And you need to use %PYTHON% to get the correct
-  # interpreter
   - "%PYTHON%\\python.exe setup.py bdist_wheel"
-
 artifacts:
-  # bdist_wheel puts your built wheel in the dist directory
   - path: dist\*
-
 branches:
   except:
     - spacy.io
-
-#on_success:
-#  You can use this step to upload your artifacts to a public website.
-#  See Appveyor's documentation for more details. Or you can simply
-#  access your wheels from the Appveyor "artifacts" tab for your build.
diff --git a/.travis.yml b/.travis.yml
index 5d48c5a48..dc6cfb4d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,20 @@
 language: python
-
 sudo: false
+cache: pip
 dist: trusty
 group: edge
-
 python:
    - "2.7"
    - "3.5"
    - "3.6"
-
 os:
   - linux
-
 env:
   - VIA=compile
   - VIA=flake8
-  #- VIA=pypi_nightly
-
 install:
   - "./travis.sh"
   - pip install flake8
-
 script:
   - "cat /proc/cpuinfo | grep flags | head -n 1"
   - "pip install pytest pytest-timeout"
@@ -28,14 +22,10 @@ script:
   - if [[ "${VIA}" == "flake8" ]]; then flake8 . --count --exclude=spacy/compat.py,spacy/lang --select=E901,E999,F821,F822,F823 --show-source --statistics; fi
   - if [[ "${VIA}" == "pypi_nightly" ]]; then python -m pytest --tb=native --models --en `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi
   - if [[ "${VIA}" == "sdist" ]]; then python -m pytest --tb=native `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi
-
+branches:
+  except:
+    - spacy.io
 notifications:
   slack:
     secure: F8GvqnweSdzImuLL64TpfG0i5rYl89liyr9tmFVsHl4c0DNiDuGhZivUz0M1broS8svE3OPOllLfQbACG/4KxD890qfF9MoHzvRDlp7U+RtwMV/YAkYn8MGWjPIbRbX0HpGdY7O2Rc9Qy4Kk0T8ZgiqXYIqAz2Eva9/9BlSmsJQ=
   email: false
-
-branches:
-  except:
-  - spacy.io
-
-cache: pip