From c9f4ca05da2870c1010bdd7c7dfa28329268c774 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Thu, 4 Oct 2018 17:42:47 -0700 Subject: [PATCH 1/3] CI: Fix yaml/yml inconsistency --- ci/{azure-windows-27.yaml => azure-windows-27.yml} | 0 ci/{azure-windows-36.yaml => azure-windows-36.yml} | 0 ci/incremental/setup_conda_environment.cmd | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename ci/{azure-windows-27.yaml => azure-windows-27.yml} (100%) rename ci/{azure-windows-36.yaml => azure-windows-36.yml} (100%) diff --git a/ci/azure-windows-27.yaml b/ci/azure-windows-27.yml similarity index 100% rename from ci/azure-windows-27.yaml rename to ci/azure-windows-27.yml diff --git a/ci/azure-windows-36.yaml b/ci/azure-windows-36.yml similarity index 100% rename from ci/azure-windows-36.yaml rename to ci/azure-windows-36.yml diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index b4446c49fabd3..39b90154a91e7 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -13,7 +13,7 @@ conda list @rem Clean up any left-over from a previous build conda remove --all -q -y -n %CONDA_ENV% @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite -conda env create -n %CONDA_ENV% --file=ci\azure-windows-%CONDA_PY%.yaml +conda env create -n %CONDA_ENV% --file=ci\azure-windows-%CONDA_PY%.yml call activate %CONDA_ENV% conda list From 41d901df01ec66dfe8b760196c2f2a497c309a5c Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Fri, 5 Oct 2018 08:47:56 -0700 Subject: [PATCH 2/3] go the other direction --- ci/{azure-macos-35.yml => azure-macos-35.yaml} | 0 ci/{azure-windows-27.yml => azure-windows-27.yaml} | 0 ci/{azure-windows-36.yml => azure-windows-36.yaml} | 0 ci/azure/windows-py27.yml | 2 +- ci/azure/windows.yml | 2 +- ci/incremental/setup_conda_environment.cmd | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename ci/{azure-macos-35.yml => azure-macos-35.yaml} (100%) rename ci/{azure-windows-27.yml => azure-windows-27.yaml} (100%) rename ci/{azure-windows-36.yml => azure-windows-36.yaml} (100%) diff --git a/ci/azure-macos-35.yml b/ci/azure-macos-35.yaml similarity index 100% rename from ci/azure-macos-35.yml rename to ci/azure-macos-35.yaml diff --git a/ci/azure-windows-27.yml b/ci/azure-windows-27.yaml similarity index 100% rename from ci/azure-windows-27.yml rename to ci/azure-windows-27.yaml diff --git a/ci/azure-windows-36.yml b/ci/azure-windows-36.yaml similarity index 100% rename from ci/azure-windows-36.yml rename to ci/azure-windows-36.yaml diff --git a/ci/azure/windows-py27.yml b/ci/azure/windows-py27.yml index 3e92c96263930..10251bc03b8dc 100644 --- a/ci/azure/windows-py27.yml +++ b/ci/azure/windows-py27.yml @@ -10,7 +10,7 @@ jobs: maxParallel: 11 matrix: py36_np14: - ENV_FILE: ci/azure-windows-27.yml + ENV_FILE: ci/azure-windows-27.yaml CONDA_PY: "27" CONDA_ENV: pandas diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 2ab8c6f320188..fe6c9c933d474 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -10,7 +10,7 @@ jobs: maxParallel: 11 matrix: py36_np14: - ENV_FILE: ci/azure-windows-36.yml + ENV_FILE: ci/azure-windows-36.yaml CONDA_PY: "36" CONDA_ENV: pandas diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 39b90154a91e7..b4446c49fabd3 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -13,7 +13,7 @@ conda list @rem Clean up any left-over from a previous build conda remove --all -q -y -n %CONDA_ENV% @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite -conda env create -n %CONDA_ENV% --file=ci\azure-windows-%CONDA_PY%.yml +conda env create -n %CONDA_ENV% --file=ci\azure-windows-%CONDA_PY%.yaml call activate %CONDA_ENV% conda list From 72a19eea3b86289897e787b07f7472dd2deea8fb Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Fri, 5 Oct 2018 10:18:23 -0700 Subject: [PATCH 3/3] fix missed a --- ci/azure/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 5bf8d18d6cbb9..9bfaef04ea2fa 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -10,7 +10,7 @@ jobs: maxParallel: 11 matrix: py35_np_110: - ENV_FILE: ci/azure-macos-35.yml + ENV_FILE: ci/azure-macos-35.yaml CONDA_PY: "35" CONDA_ENV: pandas TEST_ARGS: "--skip-slow --skip-network"