Skip to content

Commit 07dea22

Browse files
committed
DEPS: remove py36 check in test, bump matplotlib (pandas-dev#34472)
1 parent d46c764 commit 07dea22

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed

ci/deps/azure-37-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ dependencies:
2727
- xlrd=1.1.0
2828
- xlsxwriter=1.0.2
2929
- xlwt=1.3.0
30-
- html5lib=1.0.1
30+
- html5lib=1.0.1

ci/deps/azure-windows-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- blosc
1717
- bottleneck
1818
- fastparquet>=0.3.2
19-
- matplotlib=3.1.0
19+
- matplotlib=3.1.3
2020
- numba
2121
- numexpr
2222
- numpy=1.18.*

pandas/tests/extension/test_numpy.py

-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import numpy as np
22
import pytest
33

4-
from pandas.compat.numpy import _np_version_under1p16
5-
64
import pandas as pd
75
import pandas._testing as tm
86
from pandas.core.arrays.numpy_ import PandasArray, PandasDtype
@@ -46,11 +44,7 @@ def data(allow_in_pandas, dtype):
4644

4745
@pytest.fixture
4846
def data_missing(allow_in_pandas, dtype):
49-
# For NumPy <1.16, np.array([np.nan, (1,)]) raises
50-
# ValueError: setting an array element with a sequence.
5147
if dtype.numpy_dtype == "object":
52-
if _np_version_under1p16:
53-
raise pytest.skip("Skipping for NumPy <1.16")
5448
return PandasArray(np.array([np.nan, (1,)], dtype=object))
5549
return PandasArray(np.array([np.nan, 1.0]))
5650

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto-generated from environment.yml, do not modify.
22
# See that file for comments about the need/usage of each dependency.
33

4-
numpy>=1.15
4+
numpy>=1.16
55
python-dateutil>=2.7.3
66
pytz
77
asv

0 commit comments

Comments
 (0)