From 3000c5d3b227b45728b4ae945c9a478482c475c3 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Thu, 24 Sep 2020 23:07:33 -0500 Subject: [PATCH 1/3] CI: add py38 slow build #35160 --- .travis.yml | 6 ++++++ ci/deps/travis-38-slow.yaml | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ci/deps/travis-38-slow.yaml diff --git a/.travis.yml b/.travis.yml index 81cd461dd2c87..559df32b64259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,12 @@ matrix: - env: - JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network and not clipboard)" + - env: + - JOB="3.8, slow" ENV_FILE="ci/deps/travis-38-slow.yaml" PATTERN="slow" SQL="1" + services: + - mysql + - postgresql + - env: - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network and not clipboard)" diff --git a/ci/deps/travis-38-slow.yaml b/ci/deps/travis-38-slow.yaml new file mode 100644 index 0000000000000..e4b719006a11e --- /dev/null +++ b/ci/deps/travis-38-slow.yaml @@ -0,0 +1,37 @@ +name: pandas-dev +channels: + - defaults + - conda-forge +dependencies: + - python=3.8.* + + # tools + - cython>=0.29.21 + - pytest>=5.0.1 + - pytest-xdist>=1.21 + - hypothesis>=3.58.0 + + # pandas dependencies + - beautifulsoup4 + - fsspec>=0.7.4 + - html5lib + - lxml + - matplotlib + - numexpr + - numpy + - openpyxl + - patsy + - psycopg2 + - pymysql + - pytables + - python-dateutil + - pytz + - s3fs>=0.4.0 + - moto>=1.3.14 + - scipy + - sqlalchemy + - xlrd + - xlsxwriter + - xlwt + - moto + - flask From f8189d585a1ae484fd073916839c478e309ce80d Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 25 Sep 2020 18:10:56 -0500 Subject: [PATCH 2/3] CI: move py37 to azure --- .travis.yml | 3 --- ci/azure/posix.yml | 5 +++++ ci/deps/azure-37-slow.yaml | 1 + ci/deps/{travis-37.yaml => azure-37.yaml} | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) rename ci/deps/{travis-37.yaml => azure-37.yaml} (93%) diff --git a/.travis.yml b/.travis.yml index 559df32b64259..831bdee02ecba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,9 +49,6 @@ matrix: - mysql - postgresql - - env: - - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network and not clipboard)" - - arch: arm64 env: - JOB="3.7, arm64" PYTEST_WORKERS=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)" diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 9f8174b4fa678..8839baa99112b 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -20,6 +20,11 @@ jobs: CONDA_PY: "37" PATTERN: "not slow and not network and not clipboard" + py37: + ENV_FILE: ci/deps/azure-37.yaml + CONDA_PY: "37" + PATTERN: "not slow and not network and not clipboard" + py37_locale_slow: ENV_FILE: ci/deps/azure-37-locale_slow.yaml CONDA_PY: "37" diff --git a/ci/deps/azure-37-slow.yaml b/ci/deps/azure-37-slow.yaml index 13a0d442bcae7..50fccf86b6340 100644 --- a/ci/deps/azure-37-slow.yaml +++ b/ci/deps/azure-37-slow.yaml @@ -10,6 +10,7 @@ dependencies: - pytest>=5.0.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 + - pytest-azurepipelines # pandas dependencies - beautifulsoup4 diff --git a/ci/deps/travis-37.yaml b/ci/deps/azure-37.yaml similarity index 93% rename from ci/deps/travis-37.yaml rename to ci/deps/azure-37.yaml index 6a15ce1195ea9..82cb6760b6d1e 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/azure-37.yaml @@ -10,6 +10,7 @@ dependencies: - pytest>=5.0.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 + - pytest-azurepipelines # pandas dependencies - botocore>=1.11 From 035839aa2b806e652cb1d8e8855abe0ebb789ab6 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 2 Oct 2020 21:39:33 -0500 Subject: [PATCH 3/3] CI: combine py37-locale, move py38 to azure --- .travis.yml | 3 -- ci/azure/posix.yml | 27 ++++++----------- ci/deps/azure-37-32bit.yaml | 26 ---------------- ci/deps/azure-37-locale.yaml | 37 ----------------------- ci/deps/{travis-38.yaml => azure-38.yaml} | 2 +- ci/deps/travis-37-locale.yaml | 22 +++++++++----- 6 files changed, 24 insertions(+), 93 deletions(-) delete mode 100644 ci/deps/azure-37-32bit.yaml delete mode 100644 ci/deps/azure-37-locale.yaml rename ci/deps/{travis-38.yaml => azure-38.yaml} (91%) diff --git a/.travis.yml b/.travis.yml index a72e7c48d4690..2bf72bd159fc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,6 @@ matrix: env: - JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)" - - env: - - JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network and not clipboard)" - - env: - JOB="3.8, slow" ENV_FILE="ci/deps/travis-38-slow.yaml" PATTERN="slow" SQL="1" services: diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 8839baa99112b..3a9bb14470692 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -29,35 +29,26 @@ jobs: ENV_FILE: ci/deps/azure-37-locale_slow.yaml CONDA_PY: "37" PATTERN: "slow" - # pandas does not use the language (zh_CN), but should support different encodings (utf8) - # we should test with encodings different than utf8, but doesn't seem like Ubuntu supports any - LANG: "zh_CN.utf8" - LC_ALL: "zh_CN.utf8" - EXTRA_APT: "language-pack-zh-hans" + LANG: "it_IT.utf8" + LC_ALL: "it_IT.utf8" + EXTRA_APT: "language-pack-it xsel" py37_slow: ENV_FILE: ci/deps/azure-37-slow.yaml CONDA_PY: "37" PATTERN: "slow" - py37_locale: - ENV_FILE: ci/deps/azure-37-locale.yaml - CONDA_PY: "37" - PATTERN: "not slow and not network" - LANG: "it_IT.utf8" - LC_ALL: "it_IT.utf8" - EXTRA_APT: "language-pack-it xsel" - -# py37_32bit: -# ENV_FILE: ci/deps/azure-37-32bit.yaml -# CONDA_PY: "37" -# PATTERN: "not slow and not network and not clipboard" -# BITS32: "yes" + py38: + ENV_FILE: ci/deps/azure-38.yaml + CONDA_PY: "38" + PATTERN: "not slow and not network and not clipboard" py38_locale: ENV_FILE: ci/deps/azure-38-locale.yaml CONDA_PY: "38" PATTERN: "not slow and not network" + # pandas does not use the language (zh_CN), but should support different encodings (utf8) + # we should test with encodings different than utf8, but doesn't seem like Ubuntu supports any LANG: "zh_CN.utf8" LC_ALL: "zh_CN.utf8" EXTRA_APT: "language-pack-zh-hans xsel" diff --git a/ci/deps/azure-37-32bit.yaml b/ci/deps/azure-37-32bit.yaml deleted file mode 100644 index 3cdd98485f281..0000000000000 --- a/ci/deps/azure-37-32bit.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - python=3.7.* - - # tools - ### Cython 0.29.16 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead - - pytest-xdist>=1.21 - - hypothesis>=3.58.0 - - pytest-azurepipelines - - # pandas dependencies - - attrs=19.1.0 - - gcc_linux-32 - - gxx_linux-32 - - python-dateutil - - pytz=2017.3 - - # see comment above - - pip - - pip: - - cython>=0.29.21 - - numpy>=1.16.5 - - pytest>=5.0.1 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml deleted file mode 100644 index 64480258fe65e..0000000000000 --- a/ci/deps/azure-37-locale.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: pandas-dev -channels: - - defaults - - conda-forge -dependencies: - - python=3.7.* - - # tools - - cython>=0.29.21 - - pytest>=5.0.1 - - pytest-xdist>=1.21 - - pytest-asyncio - - hypothesis>=3.58.0 - - pytest-azurepipelines - - # pandas dependencies - - beautifulsoup4 - - html5lib - - ipython - - jinja2 - - lxml - - matplotlib>=3.3.0 - - moto - - flask - - nomkl - - numexpr - - numpy=1.16.* - - openpyxl - - pytables - - python-dateutil - - pytz - - scipy - - xarray - - xlrd - - xlsxwriter - - xlwt - - moto diff --git a/ci/deps/travis-38.yaml b/ci/deps/azure-38.yaml similarity index 91% rename from ci/deps/travis-38.yaml rename to ci/deps/azure-38.yaml index 874c8dd96d008..954e9710f79b9 100644 --- a/ci/deps/travis-38.yaml +++ b/ci/deps/azure-38.yaml @@ -10,11 +10,11 @@ dependencies: - pytest>=5.0.1 - pytest-xdist>=1.21 - hypothesis>=3.58.0 + - pytest-azurepipelines # pandas dependencies - numpy - python-dateutil - nomkl - pytz - - pip - tabulate==0.8.3 diff --git a/ci/deps/travis-37-locale.yaml b/ci/deps/travis-37-locale.yaml index ddaf0bea097c7..e93a86910bf34 100644 --- a/ci/deps/travis-37-locale.yaml +++ b/ci/deps/travis-37-locale.yaml @@ -11,7 +11,12 @@ dependencies: - pytest-xdist>=1.21 - hypothesis>=3.58.0 - # pandas dependencies + # required + - numpy + - python-dateutil + - pytz + + # optional - beautifulsoup4 - blosc=1.15.0 - python-blosc @@ -20,22 +25,23 @@ dependencies: - ipython - jinja2 - lxml=4.3.0 - - matplotlib=3.0.* + - matplotlib - nomkl - numexpr - - numpy - openpyxl - pandas-gbq - google-cloud-bigquery>=1.27.2 # GH 36436 - pyarrow>=0.17 - - psycopg2=2.7 - - pymysql=0.7.11 - pytables>=3.5.1 - - python-dateutil - - pytz - scipy - - sqlalchemy=1.3.0 - xarray=0.12.0 - xlrd - xlsxwriter - xlwt + - moto + - flask + + # sql + - psycopg2=2.7 + - pymysql=0.7.11 + - sqlalchemy=1.3.0