From 8026eb53580d029e9cc4a1962da0895cb9fa54db Mon Sep 17 00:00:00 2001
From: Jeff Reback <jeff@reback.net>
Date: Mon, 20 Feb 2017 21:53:02 -0500
Subject: [PATCH] TST: remove 4 builds from travis that are on circleci

---
 .travis.yml | 109 ----------------------------------------------------
 circle.yml  |   5 ++-
 2 files changed, 4 insertions(+), 110 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb96ab210c088..97bf881f3b6fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,21 +91,6 @@ matrix:
           packages:
           - libatlas-base-dev
           - gfortran
-#    In allow_failures
-    - python: 2.7
-      env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - TEST_ARGS="--skip-slow --skip-network"
-        - LOCALE_OVERRIDE="it_IT.UTF-8"
-        - INSTALL_TEST=true
-        - JOB_TAG=_COMPAT
-        - CACHE_NAME="27_nslow_nnet_COMPAT"
-        - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - language-pack-it
 #    In allow_failures
     - python: 2.7
       env:
@@ -127,37 +112,6 @@ matrix:
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
         - USE_CACHE=true
-#    In allow_failures
-    - python: 3.4
-      env:
-        - PYTHON_VERSION=3.4
-        - JOB_NAME: "34_nslow"
-        - LOCALE_OVERRIDE="zh_CN.UTF-8"
-        - TEST_ARGS="--skip-slow"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
-        - CACHE_NAME="34_nslow"
-        - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - xsel
-          - language-pack-zh-hans
-#    In allow_failures
-    - python: 3.4
-      env:
-        - PYTHON_VERSION=3.4
-        - JOB_NAME: "34_slow"
-        - JOB_TAG=_SLOW
-        - TEST_ARGS="--only-slow --skip-network"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
-        - CACHE_NAME="34_slow"
-        - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - xsel
 #    In allow_failures
     - python: 3.5
       env:
@@ -173,16 +127,6 @@ matrix:
           packages:
           - libatlas-base-dev
           - gfortran
-#    In allow_failures
-    - python: 3.5
-      env:
-        - PYTHON_VERSION=3.5
-        - JOB_NAME: "35_ascii"
-        - JOB_TAG=_ASCII
-        - TEST_ARGS="--skip-slow --skip-network"
-        - LOCALE_OVERRIDE="C"
-        - CACHE_NAME="35_ascii"
-        - USE_CACHE=true
 #    In allow_failures
     - python: 3.5
       env:
@@ -203,20 +147,6 @@ matrix:
         - FULL_DEPS=true
         - CACHE_NAME="27_slow"
         - USE_CACHE=true
-      - python: 3.4
-        env:
-        - PYTHON_VERSION=3.4
-        - JOB_NAME: "34_slow"
-        - JOB_TAG=_SLOW
-        - TEST_ARGS="--only-slow --skip-network"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
-        - CACHE_NAME="34_slow"
-        - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - xsel
       - python: 2.7
         env:
         - PYTHON_VERSION=2.7
@@ -227,21 +157,6 @@ matrix:
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
         - USE_CACHE=true
-      - python: 3.4
-        env:
-          - PYTHON_VERSION=3.4
-          - JOB_NAME: "34_nslow"
-          - LOCALE_OVERRIDE="zh_CN.UTF-8"
-          - TEST_ARGS="--skip-slow"
-          - FULL_DEPS=true
-          - CLIPBOARD=xsel
-          - CACHE_NAME="34_nslow"
-          - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - xsel
-            - language-pack-zh-hans
       - python: 3.5
         env:
           - PYTHON_VERSION=3.5
@@ -256,29 +171,6 @@ matrix:
             packages:
             - libatlas-base-dev
             - gfortran
-      - python: 2.7
-        env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - TEST_ARGS="--skip-slow --skip-network"
-        - LOCALE_OVERRIDE="it_IT.UTF-8"
-        - INSTALL_TEST=true
-        - JOB_TAG=_COMPAT
-        - CACHE_NAME="27_nslow_nnet_COMPAT"
-        - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - language-pack-it
-      - python: 3.5
-        env:
-        - PYTHON_VERSION=3.5
-        - JOB_NAME: "35_ascii"
-        - JOB_TAG=_ASCII
-        - TEST_ARGS="--skip-slow --skip-network"
-        - LOCALE_OVERRIDE="C"
-        - CACHE_NAME="35_ascii"
-        - USE_CACHE=true
       - python: 3.5
         env:
         - PYTHON_VERSION=3.5
@@ -299,7 +191,6 @@ before_install:
   - pwd
   - uname -a
   - python -V
-# git info & get tags
   - git --version
   - git tag
   - ci/before_install_travis.sh
diff --git a/circle.yml b/circle.yml
index 97136d368ae6f..046af6e9e1389 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,16 +3,18 @@ machine:
     # these are globally set
     MINICONDA_DIR: /home/ubuntu/miniconda3
 
+
 database:
   override:
     - ./ci/install_db_circle.sh
 
+
 checkout:
   post:
     # since circleci does a shallow fetch
     # we need to populate our tags
     - git fetch --depth=1000
-    - git fetch --tags
+
 
 dependencies:
   override:
@@ -29,6 +31,7 @@ dependencies:
       esac
     - ./ci/show_circle.sh
 
+
 test:
   override:
       - case $CIRCLE_NODE_INDEX in 0) ./ci/run_circle.sh --skip-slow --skip-network ;; 1) ./ci/run_circle.sh --only-slow --skip-network ;; 2) ./ci/run_circle.sh --skip-slow --skip-network ;; 3) ./ci/run_circle.sh --skip-slow --skip-network ;; esac: