Skip to content

Commit 6845248

Browse files
CI: troubleshoot travis-36-cov on 1.1.x (#37311)
1 parent 6201a09 commit 6845248

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ matrix:
4646
# Enabling Deprecations when running tests
4747
# PANDAS_TESTING_MODE="deprecate" causes DeprecationWarning messages to be displayed in the logs
4848
# See pandas/_testing.py for more details.
49-
- 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"
49+
- 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"
5050
services:
5151
- mysql
5252
- postgresql

ci/deps/travis-36-cov.yaml renamed to ci/deps/travis-37-cov.yaml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: pandas-dev
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
6-
- python=3.6.*
5+
- python=3.7.*
76

87
# tools
98
- cython>=0.29.21
@@ -22,18 +21,21 @@ dependencies:
2221
- geopandas
2322
- html5lib
2423
- matplotlib
25-
- moto
24+
- moto>=1.3.14
25+
- flask
2626
- nomkl
2727
- numexpr
28-
- numpy=1.15.*
28+
- numpy=1.16.*
2929
- odfpy
3030
- openpyxl
3131
- pandas-gbq
32+
- google-cloud-bigquery>=1.27.2 # GH 36436
3233
- psycopg2
33-
- pyarrow>=0.13.0
34-
- pymysql
34+
- pyarrow>=0.15.0
35+
- pymysql<0.10.0 # temporary pin, GH 36465
3536
- pytables
3637
- python-snappy
38+
- python-dateutil
3739
- pytz
3840
- s3fs>=0.4.0
3941
- scikit-learn
@@ -49,5 +51,4 @@ dependencies:
4951
- brotlipy
5052
- coverage
5153
- pandas-datareader
52-
- python-dateutil
5354
- pyxlsb

pandas/tests/groupby/test_categorical.py

-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.compat import PY37, is_platform_windows
7-
86
import pandas as pd
97
from pandas import (
108
Categorical,
@@ -13,7 +11,6 @@
1311
Index,
1412
MultiIndex,
1513
Series,
16-
_np_version_under1p17,
1714
qcut,
1815
)
1916
import pandas._testing as tm
@@ -244,12 +241,6 @@ def test_level_get_group(observed):
244241
tm.assert_frame_equal(result, expected)
245242

246243

247-
# GH#21636 flaky on py37; may be related to older numpy, see discussion
248-
# https://github.com/MacPython/pandas-wheels/pull/64
249-
@pytest.mark.xfail(
250-
PY37 and _np_version_under1p17 and not is_platform_windows(),
251-
reason="Flaky, GH-27902",
252-
)
253244
@pytest.mark.parametrize("ordered", [True, False])
254245
def test_apply(ordered):
255246
# GH 10138

0 commit comments

Comments
 (0)