8000 DEPS: set min versions · jreback/pandas@bcd1951 · GitHub
[go: up one dir, main page]
Skip to content

Commit bcd1951

Browse files
jrebackjreback
committed
DEPS: set min versions
closes pandas-dev#15206, numpy >= 1.9 closes pandas-dev#15543, matplotlib >= 1.4.3 closes pandas-dev#15214, bottleneck >= 1.0.0 scipy >= 0.14.0
1 parent 81f8ace commit bcd1951

21 files changed

+60
-175
lines changed

‎ci/requirements-2.7_COMPAT.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
python=2.7*
2-
numpy=1.7.1
2+
numpy=1.9.1
33
cython=0.23
44
dateutil=1.5
55
pytz=2013b

‎ci/requirements-2.7_COMPAT.run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
numpy=1.7.1
1+
numpy=1.9.1
22
dateutil=1.5
33
pytz=2013b
4-
scipy=0.11.0
4+
scipy=0.14.0
55
xlwt=0.7.5
66
xlrd=0.9.2
7-
bottleneck=0.8.0
7+
bottleneck=1.0.0
88
numexpr=2.2.2
99
pytables=3.0.0
1010
html5lib=1.0b2

‎ci/requirements-2.7_LOCALE.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
python=2.7*
22
python-dateutil
33
pytz=2013b
4-
numpy=1.8.2
4+
numpy=1.9.1
55
cython=0.23

‎ci/requirements-2.7_LOCALE.run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
python-dateutil
22
pytz=2013b
3-
numpy=1.8.2
3+
numpy=1.9.1
44
xlwt=0.7.5
55
openpyxl=1.6.2
66
xlsxwriter=0.4.6
77
xlrd=0.9.2
8-
bottleneck=0.8.0
9-
matplotlib=1.3.1
8+
bottleneck=1.0.0
9+
matplotlib=1.4.3
1010
sqlalchemy=0.8.1
1111
html5lib=1.0b2
1212
lxml=3.2.1

‎ci/requirements-2.7_SLOW.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
python=2.7*
22
python-dateutil
33
pytz
4-
numpy=1.8.2
4+
numpy=1.9.1
55
cython

‎ci/requirements-2.7_SLOW.run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
python-dateutil
22
pytz
3-
numpy=1.8.2
4-
matplotlib=1.3.1
3+
numpy=1.9.1
4+
matplotlib=1.4.3
55
scipy
66
patsy
77
xlwt

‎pandas/_libs/sparse.pyx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ from distutils.version import LooseVersion
1212

1313
# numpy versioning
1414
_np_version = np.version.short_version
15-
_np_version_under1p8 = LooseVersion(_np_version) < '1.8'
16-
_np_version_under1p9 = LooseVersion(_np_version) < '1.9'
1715
_np_version_under1p10 = LooseVersion(_np_version) < '1.10'
1816
_np_version_under1p11 = LooseVersion(_np_version) < '1.11'
1917

‎pandas/compat/numpy/__init__.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@
99
# numpy versioning
1010
_np_version = np.__version__
1111
_nlv = LooseVersion(_np_version)
12-
_np_version_under1p8 = _nlv < '1.8'
13-
_np_version_under1p9 = _nlv < '1.9'
1412
_np_version_under1p10 = _nlv < '1.10'
1513
_np_version_under1p11 = _nlv < '1.11'
1614
_np_version_under1p12 = _nlv < '1.12'
1715
_np_version_under1p13 = _nlv < '1.13'
1816
_np_version_under1p14 = _nlv < '1.14'
17+
_np_version_under1p15 = _nlv < '1.15'
1918

20-
if _nlv < '1.7.0':
19+
if _nlv < '1.9':
2120
raise ImportError('this version of pandas is incompatible with '
22-
'numpy < 1.7.0\n'
21+
'numpy < 1.9.0\n'
2322
'your numpy version is {0}.\n'
24-
'Please upgrade numpy to >= 1.7.0 to use '
23+
'Please upgrade numpy to >= 1.9.0 to use '
2524
'this pandas version'.format(_np_version))
2625

2726

@@ -70,11 +69,10 @@ def np_array_datetime64_compat(arr, *args, **kwargs):
7069

7170

7271
__all__ = ['np',
73-
'_np_version_under1p8',
74-
'_np_version_under1p9',
7572
'_np_version_under1p10',
7673
'_np_version_under1p11',
7774
'_np_version_under1p12',
7875
'_np_version_under1p13',
79-
'_np_version_under1p14'
76+
'_np_version_under1p14',
77+
'_np_version_under1p15'
8078
]

‎pandas/core/algorithms.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from warnings import warn, catch_warnings
77
import numpy as np
88

9-
from pandas import compat, _np_version_under1p8
9+
from pandas import compat
1010
from pandas.core.dtypes.cast import maybe_promote
1111
from pandas.core.dtypes.generic import (
1212
ABCSeries, ABCIndex,
@@ -398,11 +398,9 @@ def isin(comps, values):
398398
comps, dtype, _ = _ensure_data(comps)
399399
values, _, _ = _ensure_data(values, dtype=dtype)
400400

401-
# GH11232
402-
# work-around for numpy < 1.8 and comparisions on py3
403401
# faster for larger cases to use np.in1d
404402
f = lambda x, y: htable.ismember_object(x, values)
405-
if (_np_version_under1p8 and compat.PY3) or len(comps) > 1000000:
403+
if len(comps) > 1000000:
406404
f = lambda x, y: np.in1d(x, y)
407405
elif is_integer_dtype(comps):
408406
try:

‎pandas/core/generic.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,11 +1744,8 @@ def _box_item_values(self, key, values):
17441744

17451745
def _maybe_cache_changed(self, item, value):
17461746
"""The object has called back to us saying maybe it has changed.
1747-
1748-
numpy < 1.8 has an issue with object arrays and aliasing
1749-
GH6026
17501747
"""
1751-
self._data.set(item, value, check=pd._np_version_under1p8)
1748+
self._data.set(item, value, check=False)
17521749

17531750
@property
17541751
def _is_cached(self):

0 commit comments

Comments
 (0)
0