From 513d019075c94d6b0c45649f14ca9b7a3c27b7fc Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 21 Oct 2020 14:36:13 +0100 Subject: [PATCH 1/8] CI: troubleshoot travis-36-cov on 1.1.x --- ci/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 065f9e56ea171..82dc5775a57c7 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -104,8 +104,8 @@ conda list conda remove --all -q -y -n pandas-dev echo -echo "conda env create -q --file=${ENV_FILE}" -time conda env create -q --file="${ENV_FILE}" +echo "conda env create --file=${ENV_FILE}" +time conda env create --file="${ENV_FILE}" if [[ "$BITS32" == "yes" ]]; then From 70145cd052de4bd5a6bcb950ee2b80b73c7825ca Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 21 Oct 2020 15:47:32 +0100 Subject: [PATCH 2/8] try again --- ci/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 82dc5775a57c7..b81250cb97a68 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -62,7 +62,7 @@ which conda echo echo "update conda" conda config --set ssl_verify false -conda config --set quiet true --set always_yes true --set changeps1 false +conda config --set always_yes true --set changeps1 false conda install pip conda # create conda to create a historical artifact for pip & setuptools conda update -n base conda From 90fc0e494e5d9c26db696fc5bfa41c4bfc2245ac Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 21 Oct 2020 16:29:32 +0100 Subject: [PATCH 3/8] another go --- .travis.yml | 2 +- ci/setup_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e5ea21b0f2d9..417221479ab49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ before_install: install: - echo "install start" - ci/prep_cython_cache.sh - - ci/setup_env.sh + - travis_wait ci/setup_env.sh - ci/submit_cython_cache.sh - echo "install done" diff --git a/ci/setup_env.sh b/ci/setup_env.sh index b81250cb97a68..c74f5f670872c 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -105,7 +105,7 @@ conda remove --all -q -y -n pandas-dev echo echo "conda env create --file=${ENV_FILE}" -time conda env create --file="${ENV_FILE}" +conda env create --file="${ENV_FILE}" if [[ "$BITS32" == "yes" ]]; then From 6d772bdead47820a5151afe3196e469b81f3a7ca Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 21 Oct 2020 17:33:49 +0100 Subject: [PATCH 4/8] conda-forge only --- .travis.yml | 2 +- ci/deps/travis-36-cov.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 417221479ab49..1e5ea21b0f2d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ before_install: install: - echo "install start" - ci/prep_cython_cache.sh - - travis_wait ci/setup_env.sh + - ci/setup_env.sh - ci/submit_cython_cache.sh - echo "install done" diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 8c8db106af05c..6071d4dd3b5e5 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -1,6 +1,5 @@ name: pandas-dev channels: - - defaults - conda-forge dependencies: - python=3.6.* From 882257610f0fee1730681dc532c237b7e6ea15a9 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Fri, 23 Oct 2020 22:14:06 +0100 Subject: [PATCH 5/8] conda config --set channel_priority strict --- ci/setup_env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index c74f5f670872c..4e34f3addbd0b 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -104,6 +104,7 @@ conda list conda remove --all -q -y -n pandas-dev echo +conda config --set channel_priority strict echo "conda env create --file=${ENV_FILE}" conda env create --file="${ENV_FILE}" From bd0e90b522ee0ae2212ecfad427e32e989ad8fb4 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 25 Nov 2020 22:42:44 +0000 Subject: [PATCH 6/8] use py37 for coverage instead --- .travis.yml | 2 +- ci/deps/{travis-36-cov.yaml => travis-37-cov.yaml} | 3 ++- ci/setup_env.sh | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename ci/deps/{travis-36-cov.yaml => travis-37-cov.yaml} (96%) diff --git a/.travis.yml b/.travis.yml index f43f4a1d16ff8..f16b19814874e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ matrix: # Enabling Deprecations when running tests # PANDAS_TESTING_MODE="deprecate" causes DeprecationWarning messages to be displayed in the logs # See pandas/_testing.py for more details. - - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1" + - JOB="3.7, coverage" ENV_FILE="ci/deps/travis-37-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1" services: - mysql - postgresql diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-37-cov.yaml similarity index 96% rename from ci/deps/travis-36-cov.yaml rename to ci/deps/travis-37-cov.yaml index 6071d4dd3b5e5..653efd9ca94f3 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-37-cov.yaml @@ -1,8 +1,9 @@ name: pandas-dev channels: + - defaults - conda-forge dependencies: - - python=3.6.* + - python=3.7.* # tools - cython>=0.29.21 diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 60ebf7cf4098e..9adb6fe674099 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -57,7 +57,7 @@ which conda echo echo "update conda" conda config --set ssl_verify false -conda config --set always_yes true --set changeps1 false +conda config --set quiet true --set always_yes true --set changeps1 false conda install pip conda # create conda to create a historical artifact for pip & setuptools conda update -n base conda @@ -99,9 +99,8 @@ conda list conda remove --all -q -y -n pandas-dev echo -conda config --set channel_priority strict -echo "conda env create --file=${ENV_FILE}" -conda env create --file="${ENV_FILE}" +echo "conda env create -q --file=${ENV_FILE}" +time conda env create -q --file="${ENV_FILE}" if [[ "$BITS32" == "yes" ]]; then From 924751c5a8b585e85025ffad4283124c5a06da68 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 26 Nov 2020 10:05:09 +0000 Subject: [PATCH 7/8] copy versions from master --- ci/deps/travis-37-cov.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/deps/travis-37-cov.yaml b/ci/deps/travis-37-cov.yaml index 653efd9ca94f3..c89b42ef06a2e 100644 --- a/ci/deps/travis-37-cov.yaml +++ b/ci/deps/travis-37-cov.yaml @@ -1,6 +1,5 @@ name: pandas-dev channels: - - defaults - conda-forge dependencies: - python=3.7.* @@ -22,18 +21,21 @@ dependencies: - geopandas - html5lib - matplotlib - - moto + - moto>=1.3.14 + - flask - nomkl - numexpr - - numpy=1.15.* + - numpy=1.16.* - odfpy - openpyxl - pandas-gbq + - google-cloud-bigquery>=1.27.2 # GH 36436 - psycopg2 - - pyarrow>=0.13.0 - - pymysql + - pyarrow>=0.15.0 + - pymysql<0.10.0 # temporary pin, GH 36465 - pytables - python-snappy + - python-dateutil - pytz - s3fs>=0.4.0 - scikit-learn @@ -49,5 +51,4 @@ dependencies: - brotlipy - coverage - pandas-datareader - - python-dateutil - pyxlsb From 66ee6f3acb82368a9901831c52db9e20308bf4a6 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Thu, 26 Nov 2020 12:30:51 +0000 Subject: [PATCH 8/8] xfail changes from #35214 for test_apply --- pandas/tests/groupby/test_categorical.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pandas/tests/groupby/test_categorical.py b/pandas/tests/groupby/test_categorical.py index 0d447a70b540d..eb3847e9ac19f 100644 --- a/pandas/tests/groupby/test_categorical.py +++ b/pandas/tests/groupby/test_categorical.py @@ -3,8 +3,6 @@ import numpy as np import pytest -from pandas.compat import PY37, is_platform_windows - import pandas as pd from pandas import ( Categorical, @@ -13,7 +11,6 @@ Index, MultiIndex, Series, - _np_version_under1p17, qcut, ) import pandas._testing as tm @@ -244,12 +241,6 @@ def test_level_get_group(observed): tm.assert_frame_equal(result, expected) -# GH#21636 flaky on py37; may be related to older numpy, see discussion -# https://github.com/MacPython/pandas-wheels/pull/64 -@pytest.mark.xfail( - PY37 and _np_version_under1p17 and not is_platform_windows(), - reason="Flaky, GH-27902", -) @pytest.mark.parametrize("ordered", [True, False]) def test_apply(ordered): # GH 10138