diff --git a/.travis.yml b/.travis.yml index da17aaa1ad804..899286ce99290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,14 +36,6 @@ matrix: env: - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="not slow and not network" - - dist: trusty - env: - - JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/deps/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" PATTERN="slow" - addons: - apt: - packages: - - language-pack-zh-hans - - dist: trusty env: - JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="not slow" @@ -60,14 +52,6 @@ matrix: env: - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true - - dist: trusty - env: - - JOB="3.7, NumPy dev" ENV_FILE="ci/deps/travis-37-numpydev.yaml" PATTERN="not slow and not network" TEST_ARGS="-W error" PANDAS_TESTING_MODE="deprecate" - addons: - apt: - packages: - - xsel - # In allow_failures - dist: trusty env: diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 374a82a5ed7d0..b9e0cd0b9258c 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -20,11 +20,12 @@ jobs: CONDA_PY: "27" PATTERN: "not slow and not network" - py37_locale: - ENV_FILE: ci/deps/azure-37-locale.yaml - CONDA_PY: "37" - PATTERN: "not slow and not network" + py27_locale_slow_old_np: + ENV_FILE: ci/deps/azure-27-locale.yaml + CONDA_PY: "27" + PATTERN: "slow" LOCALE_OVERRIDE: "zh_CN.UTF-8" + EXTRA_APT: "language-pack-zh-hans" py36_locale_slow: ENV_FILE: ci/deps/azure-36-locale_slow.yaml @@ -32,9 +33,23 @@ jobs: PATTERN: "not slow and not network" LOCALE_OVERRIDE: "it_IT.UTF-8" + py37_locale: + ENV_FILE: ci/deps/azure-37-locale.yaml + CONDA_PY: "37" + PATTERN: "not slow and not network" + LOCALE_OVERRIDE: "zh_CN.UTF-8" + + py37_np_dev: + ENV_FILE: ci/deps/azure-37-numpydev.yaml + CONDA_PY: "37" + PATTERN: "not slow and not network" + TEST_ARGS: "-W error" + PANDAS_TESTING_MODE: "deprecate" + EXTRA_APT: "xsel" + steps: - script: | - if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386; fi + if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi echo "Installing Miniconda" ci/incremental/install_miniconda.sh export PATH=$HOME/miniconda3/bin:$PATH diff --git a/ci/deps/travis-27-locale.yaml b/ci/deps/azure-27-locale.yaml similarity index 100% rename from ci/deps/travis-27-locale.yaml rename to ci/deps/azure-27-locale.yaml diff --git a/ci/deps/travis-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml similarity index 100% rename from ci/deps/travis-37-numpydev.yaml rename to ci/deps/azure-37-numpydev.yaml