From 1d48fb5226bb02e8d0ce932afa98c7e55ef15c43 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 13:33:13 -0600 Subject: [PATCH 1/9] avoid mixing --- ci/deps/travis-36-cov.yaml | 8 ++++---- ci/deps/travis-36-slow.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index c1403f8eb8409..a725a0212a460 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -18,7 +18,7 @@ dependencies: - cython>=0.29.13 - dask - fastparquet>=0.3.2 - - gcsfs + # - gcsfs - geopandas - html5lib - matplotlib @@ -26,12 +26,12 @@ dependencies: - nomkl - numexpr - numpy=1.15.* - - odfpy + # - odfpy - openpyxl<=3.0.1 # https://github.com/pandas-dev/pandas/pull/30009 openpyxl 3.0.2 broke - - pandas-gbq + # - pandas-gbq # https://github.com/pydata/pandas-gbq/issues/271 - - google-cloud-bigquery<=1.11 + # - google-cloud-bigquery<=1.11 - psycopg2 - pyarrow>=0.12.0 - pymysql diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index 1dfd90d0904ac..ee0f4aa36decb 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -1,7 +1,7 @@ name: pandas-dev channels: - defaults - - conda-forge + # - conda-forge dependencies: - python=3.6.* From 666b21328c0f33d6d40b8028f431c4437cf5d7b8 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 13:57:16 -0600 Subject: [PATCH 2/9] more cf --- ci/deps/travis-36-cov.yaml | 2 +- ci/deps/travis-36-slow.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index a725a0212a460..1e6d112c40517 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -1,7 +1,7 @@ name: pandas-dev channels: - defaults - - conda-forge + # - conda-forge dependencies: - python=3.6.* diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index ee0f4aa36decb..1dfd90d0904ac 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -1,7 +1,7 @@ name: pandas-dev channels: - defaults - # - conda-forge + - conda-forge dependencies: - python=3.6.* From 948a950cf4cf5a17da63ee165296109b0e1b79ad Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 14:39:10 -0600 Subject: [PATCH 3/9] ld_preload --- ci/run_tests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index b91cfb3bed8cc..c0f7003029003 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -5,6 +5,9 @@ # https://github.com/pytest-dev/pytest/issues/1075 export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') +export LD_PRELOAD=$(CONDA_PREFIX)/lib/libgomp.so +ls $(CONDA_PREFIX)/lib/ + if [ -n "$LOCALE_OVERRIDE" ]; then export LC_ALL="$LOCALE_OVERRIDE" export LANG="$LOCALE_OVERRIDE" From 88c09eece75aa33f66a1f3396613a59f2c1193c7 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 15:13:36 -0600 Subject: [PATCH 4/9] fixed prefix --- ci/run_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index c0f7003029003..cc022a44dd41f 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -5,8 +5,8 @@ # https://github.com/pytest-dev/pytest/issues/1075 export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') -export LD_PRELOAD=$(CONDA_PREFIX)/lib/libgomp.so -ls $(CONDA_PREFIX)/lib/ +ls "${CONDA_PREFIX}/lib/" +export LD_PRELOAD=${CONDA_PREFIX}/lib/libgomp.so if [ -n "$LOCALE_OVERRIDE" ]; then export LC_ALL="$LOCALE_OVERRIDE" From 98067edca58828859cf95480d7575969c2c9e156 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 15:44:12 -0600 Subject: [PATCH 5/9] services --- .travis.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0acd386eea9ed..a86a9ba818820 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,30 +30,33 @@ matrix: - python: 3.5 include: - - dist: trusty - env: + - env: - JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network)" - - dist: trusty - env: + - env: - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network)" - - dist: trusty - env: + - env: - JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" + services: + - mysql + - postgresql - - dist: trusty - env: + - env: - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true + services: + - mysql + - postgresql # In allow_failures - - dist: trusty - env: + - env: - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow" + services: + - mysql + - postgresql allow_failures: - - dist: trusty - env: + - env: - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow" before_install: From 952e8974817a495d3d6bccb7582e5d6d186791c9 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 15:44:43 -0600 Subject: [PATCH 6/9] revert xfail --- pandas/tests/test_downstream.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pandas/tests/test_downstream.py b/pandas/tests/test_downstream.py index e85e8ec90d666..ea128c8c3a422 100644 --- a/pandas/tests/test_downstream.py +++ b/pandas/tests/test_downstream.py @@ -67,9 +67,6 @@ def test_statsmodels(): # Cython import warning @pytest.mark.filterwarnings("ignore:can't:ImportWarning") -@pytest.mark.xfail( - reason="https://github.com/pandas-dev/pandas/issues/30309", strict=False -) def test_scikit_learn(df): sklearn = import_module("sklearn") # noqa From 12cf131a2a406aaf2ba6577b69efcf98943f5828 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 15:47:27 -0600 Subject: [PATCH 7/9] revert --- ci/deps/travis-36-cov.yaml | 10 +++++----- ci/run_tests.sh | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 1e6d112c40517..c1403f8eb8409 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -1,7 +1,7 @@ name: pandas-dev channels: - defaults - # - conda-forge + - conda-forge dependencies: - python=3.6.* @@ -18,7 +18,7 @@ dependencies: - cython>=0.29.13 - dask - fastparquet>=0.3.2 - # - gcsfs + - gcsfs - geopandas - html5lib - matplotlib @@ -26,12 +26,12 @@ dependencies: - nomkl - numexpr - numpy=1.15.* - # - odfpy + - odfpy - openpyxl<=3.0.1 # https://github.com/pandas-dev/pandas/pull/30009 openpyxl 3.0.2 broke - # - pandas-gbq + - pandas-gbq # https://github.com/pydata/pandas-gbq/issues/271 - # - google-cloud-bigquery<=1.11 + - google-cloud-bigquery<=1.11 - psycopg2 - pyarrow>=0.12.0 - pymysql diff --git a/ci/run_tests.sh b/ci/run_tests.sh index cc022a44dd41f..b91cfb3bed8cc 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -5,9 +5,6 @@ # https://github.com/pytest-dev/pytest/issues/1075 export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') -ls "${CONDA_PREFIX}/lib/" -export LD_PRELOAD=${CONDA_PREFIX}/lib/libgomp.so - if [ -n "$LOCALE_OVERRIDE" ]; then export LC_ALL="$LOCALE_OVERRIDE" export LANG="$LOCALE_OVERRIDE" From 44f1f3dfa734c0df42e4bd52936c70d3d1de8a85 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 16:10:32 -0600 Subject: [PATCH 8/9] opt in to sql --- .travis.yml | 6 +++--- ci/setup_env.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a86a9ba818820..b9c511a100f95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,20 +37,20 @@ matrix: - JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network)" - env: - - JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" + - JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1" services: - mysql - postgresql - env: - - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true + - JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1" services: - mysql - postgresql # In allow_failures - env: - - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow" + - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow" SQL="1" services: - mysql - postgresql diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 3d79c0cfd7000..08ba83ae94451 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -140,7 +140,8 @@ echo "conda list" conda list # Install DB for Linux -if [ "${TRAVIS_OS_NAME}" == "linux" ]; then + +if [[ -n ${SQL:0} ]]; then echo "installing dbs" mysql -e 'create database pandas_nosetest;' psql -c 'create database pandas_nosetest;' -U postgres From 2ee0e9489f1564881a7e13b684f37c8734cc6af0 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 17 Dec 2019 16:58:44 -0600 Subject: [PATCH 9/9] fix allowed failure --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9c511a100f95..0c7740295b637 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ matrix: allow_failures: - env: - - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow" + - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow" SQL="1" before_install: - echo "before_install"