diff --git a/.travis.yml b/.travis.yml index 2ef8e0e03aaf8..2bf72bd159fc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,10 +41,10 @@ matrix: - 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.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network and not clipboard)" + - JOB="3.8, slow" ENV_FILE="ci/deps/travis-38-slow.yaml" PATTERN="slow" SQL="1" + services: + - mysql + - postgresql - env: - JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1" diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 9f8174b4fa678..3a9bb14470692 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -20,39 +20,35 @@ 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" 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-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 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 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/travis-38-slow.yaml similarity index 70% rename from ci/deps/azure-37-locale.yaml rename to ci/deps/travis-38-slow.yaml index 64480258fe65e..e4b719006a11e 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/travis-38-slow.yaml @@ -3,35 +3,35 @@ channels: - defaults - conda-forge dependencies: - - python=3.7.* + - python=3.8.* # tools - cython>=0.29.21 - pytest>=5.0.1 - pytest-xdist>=1.21 - - pytest-asyncio - hypothesis>=3.58.0 - - pytest-azurepipelines # pandas dependencies - beautifulsoup4 + - fsspec>=0.7.4 - html5lib - - ipython - - jinja2 - lxml - - matplotlib>=3.3.0 - - moto - - flask - - nomkl + - matplotlib - numexpr - - numpy=1.16.* + - numpy - openpyxl + - patsy + - psycopg2 + - pymysql - pytables - python-dateutil - pytz + - s3fs>=0.4.0 + - moto>=1.3.14 - scipy - - xarray + - sqlalchemy - xlrd - xlsxwriter - xlwt - moto + - flask