From bb5cb1cbd23735bab9cbeaa466563676ba9f2ae0 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Wed, 2 Mar 2016 11:26:25 -0500 Subject: [PATCH] COMPAT: remove boto dep check, xref #11915 --- ci/requirements-3.5.run | 1 + doc/source/whatsnew/v0.18.0.txt | 2 +- pandas/computation/expressions.py | 3 +++ pandas/core/datetools.py | 8 +++++--- pandas/core/format.py | 2 +- pandas/io/common.py | 4 ++++ pandas/util/clipboard.py | 1 + pandas/util/print_versions.py | 3 ++- 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ci/requirements-3.5.run b/ci/requirements-3.5.run index 4ba3b473b3edd..fdc5f3f7dc992 100644 --- a/ci/requirements-3.5.run +++ b/ci/requirements-3.5.run @@ -18,6 +18,7 @@ sqlalchemy pymysql psycopg2 xarray +boto # incompat with conda ATM # beautiful-soup diff --git a/doc/source/whatsnew/v0.18.0.txt b/doc/source/whatsnew/v0.18.0.txt index 049152dba9a30..8d36d323f48f9 100644 --- a/doc/source/whatsnew/v0.18.0.txt +++ b/doc/source/whatsnew/v0.18.0.txt @@ -1125,7 +1125,7 @@ Bug Fixes - Bug in ``Series.resample`` using a frequency of ``Nano`` when the index is a ``DatetimeIndex`` and contains non-zero nanosecond parts (:issue:`12037`) - Bug in resampling with ``.nunique`` and a sparse index (:issue:`12352`) - Removed some compiler warnings (:issue:`12471`) - +- Work around compat issues with ``boto`` in python 3.5 (:issue:`11915`) - Bug in ``NaT`` subtraction from ``Timestamp`` or ``DatetimeIndex`` with timezones (:issue:`11718`) - Bug in subtraction of ``Series`` of a single tz-aware ``Timestamp`` (:issue:`12290`) diff --git a/pandas/computation/expressions.py b/pandas/computation/expressions.py index 82fbefd5ab608..086e92dbde1a0 100644 --- a/pandas/computation/expressions.py +++ b/pandas/computation/expressions.py @@ -11,6 +11,9 @@ from pandas.core.common import _values_from_object from pandas.computation import _NUMEXPR_INSTALLED +if _NUMEXPR_INSTALLED: + import numexpr as ne + _TEST_MODE = None _TEST_RESULT = None _USE_NUMEXPR = _NUMEXPR_INSTALLED diff --git a/pandas/core/datetools.py b/pandas/core/datetools.py index 91b33d30004b6..79718c79f9bdd 100644 --- a/pandas/core/datetools.py +++ b/pandas/core/datetools.py @@ -1,8 +1,10 @@ """A collection of random tools for dealing with dates in Python""" -from pandas.tseries.tools import * # noqa -from pandas.tseries.offsets import * # noqa -from pandas.tseries.frequencies import * # noqa +# flake8: noqa + +from pandas.tseries.tools import * +from pandas.tseries.offsets import * +from pandas.tseries.frequencies import * day = DateOffset() bday = BDay() diff --git a/pandas/core/format.py b/pandas/core/format.py index 101a5e64b65b5..1f1ff73869f73 100644 --- a/pandas/core/format.py +++ b/pandas/core/format.py @@ -10,7 +10,7 @@ from pandas.core.index import Index, MultiIndex, _ensure_index from pandas import compat from pandas.compat import (StringIO, lzip, range, map, zip, reduce, u, - OrderedDict) + OrderedDict, unichr) from pandas.util.terminal import get_terminal_size from pandas.core.config import get_option, set_option from pandas.io.common import _get_handle, UnicodeWriter, _expand_user diff --git a/pandas/io/common.py b/pandas/io/common.py index 8c9c348b9a11c..be8c3ccfe08e6 100644 --- a/pandas/io/common.py +++ b/pandas/io/common.py @@ -146,6 +146,10 @@ def readline(self): except ImportError: # boto is only needed for reading from S3. pass +except TypeError: + # boto/boto3 issues + # GH11915 + pass def _is_url(url): diff --git a/pandas/util/clipboard.py b/pandas/util/clipboard.py index 026f13aad0bf3..02da0d5b8159f 100644 --- a/pandas/util/clipboard.py +++ b/pandas/util/clipboard.py @@ -45,6 +45,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# flake8: noqa import platform import os diff --git a/pandas/util/print_versions.py b/pandas/util/print_versions.py index 80c10b53d37b5..c972caad5d74c 100644 --- a/pandas/util/print_versions.py +++ b/pandas/util/print_versions.py @@ -91,7 +91,8 @@ def show_versions(as_json=False): ("sqlalchemy", lambda mod: mod.__version__), ("pymysql", lambda mod: mod.__version__), ("psycopg2", lambda mod: mod.__version__), - ("jinja2", lambda mod: mod.__version__) + ("jinja2", lambda mod: mod.__version__), + ("boto", lambda mod: mod.__version__) ] deps_blob = list()