From 6d30c8d5e3612e2308adc6594a16a08c38f22e68 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 5 Nov 2018 16:08:58 -0600 Subject: [PATCH 1/6] empty commit From b26a6c2b12755a7e037b4b6db42b58c66072529c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 5 Nov 2018 16:10:00 -0600 Subject: [PATCH 2/6] cancel? From 08a174ac6c6958681a56fee5b6cb329d79cca0b1 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 5 Nov 2018 16:10:10 -0600 Subject: [PATCH 3/6] cancel 2? From 8e7f4e20f7ccd4c3ae94020d33c72c1f2f215fd7 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 5 Nov 2018 16:16:54 -0600 Subject: [PATCH 4/6] CI: remove circleci workflows --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b10036818901..2cc39c71abcbd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,9 +34,3 @@ jobs: - run: name: test command: ./ci/circle/run_circle.sh --skip-slow --skip-network - -workflows: - version: 2 - build_and_test: - jobs: - - py36_locale From d4d319cb51fc865bf24c67c48b114afacebe7f9b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 5 Nov 2018 16:18:20 -0600 Subject: [PATCH 5/6] CI: remove circleci workflows --- .circleci/config.yml | 63 +++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2cc39c71abcbd..eb4702012b96d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,36 +1,33 @@ version: 2 jobs: + build: + py36_locale: + docker: + - image: continuumio/miniconda:latest + # databases configuration + - image: circleci/postgres:9.6.5-alpine-ram + environment: + POSTGRES_USER: postgres + POSTGRES_DB: pandas_nosetest + - image: circleci/mysql:8-ram + environment: + MYSQL_USER: "root" + MYSQL_HOST: "localhost" + MYSQL_ALLOW_EMPTY_PASSWORD: "true" + MYSQL_DATABASE: "pandas_nosetest" - # -------------------------------------------------------------------------- - # 1. py36_locale - # -------------------------------------------------------------------------- - py36_locale: - docker: - - image: continuumio/miniconda:latest - # databases configuration - - image: circleci/postgres:9.6.5-alpine-ram - environment: - POSTGRES_USER: postgres - POSTGRES_DB: pandas_nosetest - - image: circleci/mysql:8-ram - environment: - MYSQL_USER: "root" - MYSQL_HOST: "localhost" - MYSQL_ALLOW_EMPTY_PASSWORD: "true" - MYSQL_DATABASE: "pandas_nosetest" - - environment: - JOB: "3.6_LOCALE" - ENV_FILE: "ci/circle-36-locale.yaml" - LOCALE_OVERRIDE: "zh_CN.UTF-8" - MINICONDA_DIR: /home/ubuntu/miniconda3 - steps: - - checkout - - run: - name: build - command: | - ./ci/circle/install_circle.sh - ./ci/circle/show_circle.sh - - run: - name: test - command: ./ci/circle/run_circle.sh --skip-slow --skip-network + environment: + JOB: "3.6_LOCALE" + ENV_FILE: "ci/circle-36-locale.yaml" + LOCALE_OVERRIDE: "zh_CN.UTF-8" + MINICONDA_DIR: /home/ubuntu/miniconda3 + steps: + - checkout + - run: + name: build + command: | + ./ci/circle/install_circle.sh + ./ci/circle/show_circle.sh + - run: + name: test + command: ./ci/circle/run_circle.sh --skip-slow --skip-network From 5bea61995f0f124a2db90a25085831c551fe8d17 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 5 Nov 2018 16:19:13 -0600 Subject: [PATCH 6/6] CI: remove circleci workflows (3) --- .circleci/config.yml | 57 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb4702012b96d..c05363bf136d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,33 +1,32 @@ version: 2 jobs: build: - py36_locale: - docker: - - image: continuumio/miniconda:latest - # databases configuration - - image: circleci/postgres:9.6.5-alpine-ram - environment: - POSTGRES_USER: postgres - POSTGRES_DB: pandas_nosetest - - image: circleci/mysql:8-ram - environment: - MYSQL_USER: "root" - MYSQL_HOST: "localhost" - MYSQL_ALLOW_EMPTY_PASSWORD: "true" - MYSQL_DATABASE: "pandas_nosetest" + docker: + - image: continuumio/miniconda:latest + # databases configuration + - image: circleci/postgres:9.6.5-alpine-ram + environment: + POSTGRES_USER: postgres + POSTGRES_DB: pandas_nosetest + - image: circleci/mysql:8-ram + environment: + MYSQL_USER: "root" + MYSQL_HOST: "localhost" + MYSQL_ALLOW_EMPTY_PASSWORD: "true" + MYSQL_DATABASE: "pandas_nosetest" - environment: - JOB: "3.6_LOCALE" - ENV_FILE: "ci/circle-36-locale.yaml" - LOCALE_OVERRIDE: "zh_CN.UTF-8" - MINICONDA_DIR: /home/ubuntu/miniconda3 - steps: - - checkout - - run: - name: build - command: | - ./ci/circle/install_circle.sh - ./ci/circle/show_circle.sh - - run: - name: test - command: ./ci/circle/run_circle.sh --skip-slow --skip-network + environment: + JOB: "3.6_LOCALE" + ENV_FILE: "ci/circle-36-locale.yaml" + LOCALE_OVERRIDE: "zh_CN.UTF-8" + MINICONDA_DIR: /home/ubuntu/miniconda3 + steps: + - checkout + - run: + name: build + command: | + ./ci/circle/install_circle.sh + ./ci/circle/show_circle.sh + - run: + name: test + command: ./ci/circle/run_circle.sh --skip-slow --skip-network