Skip to content

Commit b653b47

Browse files
committed
more build deps
1 parent b3757d8 commit b653b47

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

ci/environment-dev.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ dependencies:
66
- Cython
77
- NumPy
88
- moto
9-
- pytest
10-
- python-dateutil
9+
- pytest>=3.1
10+
- python-dateutil>=2.5.0
1111
- python=3
12-
- pytz
12+
- pytz>=2016.1
1313
- setuptools
1414
- sphinx

ci/requirements-optional-pip.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# This file was autogenerated by scripts/convert_deps.py
2-
# Do not modify directlybeautifulsoup4
2+
# Do not modify directly
3+
beautifulsoup4
34
blosc
45
bottleneck
56
fastparquet
67
feather-format
78
html5lib
89
ipython
10+
ipykernel
911
jinja2
1012
lxml
1113
matplotlib

ci/requirements_dev.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Cython
44
NumPy
55
moto
6-
pytest
7-
python-dateutil
8-
pytz
6+
pytest>=3.1
7+
python-dateutil>=2.5.0
8+
pytz>=2016.1
99
setuptools
1010
sphinx

conda.recipe/meta.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ requirements:
1616
- cython
1717
- numpy x.x
1818
- setuptools
19-
- pytz
20-
- python-dateutil
2119

2220
run:
2321
- python
2422
- numpy x.x
2523
- python-dateutil >=2.5.0
26-
- pytz
24+
- pytz >=2016.1
2725

2826
test:
2927
imports:

doc/source/whatsnew/v0.22.0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ Other Enhancements
5151
Backwards incompatible API changes
5252
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5353

54-
<<<<<<< 93855ed7385e8a4a3550332bb706821633b97c03
5554
- :func:`Series.fillna` now raises a ``TypeError`` instead of a ``ValueError`` when passed a list, tuple or DataFrame as a ``value`` (:issue:`18293`)
5655
- :func:`pandas.DataFrame.merge` no longer casts a ``float`` column to ``object`` when merging on ``int`` and ``float`` columns (:issue:`16572`)
5756
- The default NA value for :class:`UInt64Index` has changed from 0 to ``NaN``, which impacts methods that mask with NA, such as ``UInt64Index.where()`` (:issue:`18398`)

pandas/compat/__init__.py

+5
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,11 @@ def raise_with_traceback(exc, traceback=Ellipsis):
404404
from dateutil import parser as _date_parser
405405
parse_date = _date_parser.parse
406406

407+
# pytz minimum version
408+
import pytz
409+
410+
if LooseVersion(pytz.__version__) < '2016.1':
411+
raise ImportError('pytz 2016.1 is the minimum required version')
407412

408413
# https://github.com/pandas-dev/pandas/pull/9123
409414
def is_platform_little_endian():

0 commit comments

Comments
 (0)