diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b10036818901..cdfe93613fbdd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ jobs: environment: JOB: "3.6_LOCALE" - ENV_FILE: "ci/circle-36-locale.yaml" + ENV_FILE: "ci/deps/circle-36-locale.yaml" LOCALE_OVERRIDE: "zh_CN.UTF-8" MINICONDA_DIR: /home/ubuntu/miniconda3 steps: diff --git a/.travis.yml b/.travis.yml index 8ac4d827b0820..9fac09e1fa788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,28 +34,28 @@ matrix: include: - dist: trusty env: - - JOB="3.7" ENV_FILE="ci/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network" + - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" TEST_ARGS="--skip-slow --skip-network" - dist: trusty env: - - JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true + - JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/deps/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true addons: apt: packages: - language-pack-zh-hans - dist: trusty env: - - JOB="2.7" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" + - JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" TEST_ARGS="--skip-slow" addons: apt: packages: - python-gtk2 - dist: trusty env: - - JOB="3.6, lint, coverage" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true LINT=true + - JOB="3.6, lint, coverage" ENV_FILE="ci/deps/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true LINT=true - dist: trusty env: - - JOB="3.7, NumPy dev" ENV_FILE="ci/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate" + - JOB="3.7, NumPy dev" ENV_FILE="ci/deps/travis-37-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network -W error" PANDAS_TESTING_MODE="deprecate" addons: apt: packages: @@ -64,19 +64,19 @@ matrix: # In allow_failures - dist: trusty env: - - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" SLOW=true # In allow_failures - dist: trusty env: - - JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true allow_failures: - dist: trusty env: - - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true + - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" SLOW=true - dist: trusty env: - - JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true + - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true before_install: - echo "before_install" diff --git a/ci/azure/linux.yml b/ci/azure/linux.yml index f34cba69a6195..1f62c30f6dfef 100644 --- a/ci/azure/linux.yml +++ b/ci/azure/linux.yml @@ -10,20 +10,20 @@ jobs: maxParallel: 11 matrix: py27_np_19: - ENV_FILE: ci/azure-27-compat.yaml + ENV_FILE: ci/deps/azure-27-compat.yaml CONDA_PY: "27" CONDA_ENV: pandas TEST_ARGS: "--skip-slow --skip-network" py36_locale: - ENV_FILE: ci/azure-37-locale.yaml + ENV_FILE: ci/deps/azure-37-locale.yaml CONDA_PY: "37" CONDA_ENV: pandas TEST_ARGS: "--skip-slow --skip-network" LOCALE_OVERRIDE: "zh_CN.UTF-8" py36_locale_slow: - ENV_FILE: ci/azure-36-locale_slow.yaml + ENV_FILE: ci/deps/azure-36-locale_slow.yaml CONDA_PY: "36" CONDA_ENV: pandas TEST_ARGS: "--only-slow --skip-network" @@ -53,4 +53,4 @@ jobs: - task: PublishTestResults@2 inputs: testResultsFiles: 'test-data-*.xml' - testRunTitle: 'Linux' \ No newline at end of file + testRunTitle: 'Linux' diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 53ce51c76683c..1a44933b75853 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -10,7 +10,7 @@ jobs: maxParallel: 11 matrix: py35_np_120: - ENV_FILE: ci/azure-macos-35.yaml + ENV_FILE: ci/deps/azure-macos-35.yaml CONDA_PY: "35" CONDA_ENV: pandas TEST_ARGS: "--skip-slow --skip-network" diff --git a/ci/azure/windows-py27.yml b/ci/azure/windows-py27.yml index 991e7adc4e9d6..1f82bda5988dc 100644 --- a/ci/azure/windows-py27.yml +++ b/ci/azure/windows-py27.yml @@ -10,7 +10,7 @@ jobs: maxParallel: 11 matrix: py36_np121: - ENV_FILE: ci/azure-windows-27.yaml + ENV_FILE: ci/deps/azure-windows-27.yaml CONDA_PY: "27" CONDA_ENV: pandas diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index e2e545978e09d..74235fc64d634 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.yaml + ENV_FILE: ci/deps/azure-windows-36.yaml CONDA_PY: "36" CONDA_ENV: pandas diff --git a/ci/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml similarity index 100% rename from ci/azure-27-compat.yaml rename to ci/deps/azure-27-compat.yaml diff --git a/ci/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml similarity index 100% rename from ci/azure-36-locale_slow.yaml rename to ci/deps/azure-36-locale_slow.yaml diff --git a/ci/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml similarity index 100% rename from ci/azure-37-locale.yaml rename to ci/deps/azure-37-locale.yaml diff --git a/ci/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml similarity index 100% rename from ci/azure-macos-35.yaml rename to ci/deps/azure-macos-35.yaml diff --git a/ci/azure-windows-27.yaml b/ci/deps/azure-windows-27.yaml similarity index 100% rename from ci/azure-windows-27.yaml rename to ci/deps/azure-windows-27.yaml diff --git a/ci/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml similarity index 100% rename from ci/azure-windows-36.yaml rename to ci/deps/azure-windows-36.yaml diff --git a/ci/circle-36-locale.yaml b/ci/deps/circle-36-locale.yaml similarity index 100% rename from ci/circle-36-locale.yaml rename to ci/deps/circle-36-locale.yaml diff --git a/ci/travis-27-locale.yaml b/ci/deps/travis-27-locale.yaml similarity index 100% rename from ci/travis-27-locale.yaml rename to ci/deps/travis-27-locale.yaml diff --git a/ci/travis-27.yaml b/ci/deps/travis-27.yaml similarity index 100% rename from ci/travis-27.yaml rename to ci/deps/travis-27.yaml diff --git a/ci/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml similarity index 100% rename from ci/travis-36-doc.yaml rename to ci/deps/travis-36-doc.yaml diff --git a/ci/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml similarity index 100% rename from ci/travis-36-slow.yaml rename to ci/deps/travis-36-slow.yaml diff --git a/ci/travis-36.yaml b/ci/deps/travis-36.yaml similarity index 100% rename from ci/travis-36.yaml rename to ci/deps/travis-36.yaml diff --git a/ci/travis-37-numpydev.yaml b/ci/deps/travis-37-numpydev.yaml similarity index 100% rename from ci/travis-37-numpydev.yaml rename to ci/deps/travis-37-numpydev.yaml diff --git a/ci/travis-37.yaml b/ci/deps/travis-37.yaml similarity index 100% rename from ci/travis-37.yaml rename to ci/deps/travis-37.yaml diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index b4446c49fabd3..35595ffb03695 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\deps\azure-windows-%CONDA_PY%.yaml call activate %CONDA_ENV% conda list