more build deps

pandas-dev · Dec 3, 2017 · e2ef5ad · e2ef5ad
1 parent 2d07896
commit e2ef5ad
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/ci/environment-dev.yaml b/ci/environment-dev.yaml
@@ -6,9 +6,9 @@ dependencies:
   - Cython
   - NumPy
   - moto
-  - pytest
-  - python-dateutil
+  - pytest>=3.1
+  - python-dateutil>=2.5.0
   - python=3
-  - pytz
+  - pytz>=2016.1
   - setuptools
   - sphinx
diff --git a/ci/requirements-optional-pip.txt b/ci/requirements-optional-pip.txt
@@ -1,11 +1,13 @@
 # This file was autogenerated by scripts/convert_deps.py
-# Do not modify directlybeautifulsoup4
+# Do not modify directly
+beautifulsoup4
 blosc
 bottleneck
 fastparquet
 feather-format
 html5lib
 ipython
+ipykernel
 jinja2
 lxml
 matplotlib

diff --git a/ci/requirements_dev.txt b/ci/requirements_dev.txt
@@ -3,8 +3,8 @@
 Cython
 NumPy
 moto
-pytest
-python-dateutil
-pytz
+pytest>=3.1
+python-dateutil>=2.5.0
+pytz>=2016.1
 setuptools
 sphinx
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -16,14 +16,12 @@ requirements:
     - cython
     - numpy x.x
     - setuptools
-    - pytz
-    - python-dateutil
 
   run:
     - python
     - numpy x.x
     - python-dateutil >=2.5.0
-    - pytz
+    - pytz >=2016.1
 
 test:
   imports:

diff --git a/doc/source/whatsnew/v0.22.0.txt b/doc/source/whatsnew/v0.22.0.txt
@@ -83,7 +83,6 @@ Other Enhancements
 Backwards incompatible API changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-<<<<<<< 93855ed7385e8a4a3550332bb706821633b97c03
 - :func:`Series.fillna` now raises a ``TypeError`` instead of a ``ValueError`` when passed a list, tuple or DataFrame as a ``value`` (:issue:`18293`)
 - :func:`pandas.DataFrame.merge` no longer casts a ``float`` column to ``object`` when merging on ``int`` and ``float`` columns (:issue:`16572`)
 - 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`)

diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py
@@ -404,6 +404,11 @@ def raise_with_traceback(exc, traceback=Ellipsis):
 from dateutil import parser as _date_parser
 parse_date = _date_parser.parse
 
+# pytz minimum version
+import pytz
+
+if LooseVersion(pytz.__version__) < '2016.1':
+    raise ImportError('pytz 2016.1 is the minimum required version')
 
 # https://github.com/pandas-dev/pandas/pull/9123
 def is_platform_little_endian():