Skip to content

CI: troubleshoot travis-36-cov on 1.1.x #37311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 26, 2020
Merged

CI: troubleshoot travis-36-cov on 1.1.x #37311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
513d019
CI: troubleshoot travis-36-cov on 1.1.x
simonjayhawkins Oct 21, 2020
70145cd
try again
simonjayhawkins Oct 21, 2020
90fc0e4
another go
simonjayhawkins Oct 21, 2020
6d772bd
conda-forge only
simonjayhawkins Oct 21, 2020
e7bf346
Merge remote-tracking branch 'upstream/1.1.x' into troubleshoot-cov
simonjayhawkins Oct 23, 2020
8822576
conda config --set channel_priority strict
simonjayhawkins Oct 23, 2020
d8a8e13
Merge remote-tracking branch 'upstream/1.1.x' into troubleshoot-cov
simonjayhawkins Nov 25, 2020
bd0e90b
use py37 for coverage instead
simonjayhawkins Nov 25, 2020
924751c
copy versions from master
simonjayhawkins Nov 26, 2020
66ee6f3
xfail changes from #35214 for test_apply
simonjayhawkins Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions ci/deps/travis-36-cov.yaml → ci/deps/travis-37-cov.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.7.*

# tools
- cython>=0.29.21
Expand All @@ -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
Expand All @@ -49,5 +51,4 @@ dependencies:
- brotlipy
- coverage
- pandas-datareader
- python-dateutil
- pyxlsb
9 changes: 0 additions & 9 deletions pandas/tests/groupby/test_categorical.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -13,7 +11,6 @@
Index,
MultiIndex,
Series,
_np_version_under1p17,
qcut,
)
import pandas._testing as tm
Expand Down Expand Up @@ -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
Expand Down