Skip to content

Commit bb5cb1c

Browse files
committed
COMPAT: remove boto dep check, xref #11915
1 parent bad7c0f commit bb5cb1c

File tree

8 files changed

+18
-6
lines changed

8 files changed

+18
-6
lines changed

ci/requirements-3.5.run

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ sqlalchemy
1818
pymysql
1919
psycopg2
2020
xarray
21+
boto
2122

2223
# incompat with conda ATM
2324
# beautiful-soup

doc/source/whatsnew/v0.18.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ Bug Fixes
11251125
- Bug in ``Series.resample`` using a frequency of ``Nano`` when the index is a ``DatetimeIndex`` and contains non-zero nanosecond parts (:issue:`12037`)
11261126
- Bug in resampling with ``.nunique`` and a sparse index (:issue:`12352`)
11271127
- Removed some compiler warnings (:issue:`12471`)
1128-
1128+
- Work around compat issues with ``boto`` in python 3.5 (:issue:`11915`)
11291129
- Bug in ``NaT`` subtraction from ``Timestamp`` or ``DatetimeIndex`` with timezones (:issue:`11718`)
11301130
- Bug in subtraction of ``Series`` of a single tz-aware ``Timestamp`` (:issue:`12290`)
11311131

pandas/computation/expressions.py

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
from pandas.core.common import _values_from_object
1212
from pandas.computation import _NUMEXPR_INSTALLED
1313

14+
if _NUMEXPR_INSTALLED:
15+
import numexpr as ne
16+
1417
_TEST_MODE = None
1518
_TEST_RESULT = None
1619
_USE_NUMEXPR = _NUMEXPR_INSTALLED

pandas/core/datetools.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
"""A collection of random tools for dealing with dates in Python"""
22

3-
from pandas.tseries.tools import * # noqa
4-
from pandas.tseries.offsets import * # noqa
5-
from pandas.tseries.frequencies import * # noqa
3+
# flake8: noqa
4+
5+
from pandas.tseries.tools import *
6+
from pandas.tseries.offsets import *
7+
from pandas.tseries.frequencies import *
68

79
day = DateOffset()
810
bday = BDay()

pandas/core/format.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from pandas.core.index import Index, MultiIndex, _ensure_index
1111
from pandas import compat
1212
from pandas.compat import (StringIO, lzip, range, map, zip, reduce, u,
13-
OrderedDict)
13+
OrderedDict, unichr)
1414
from pandas.util.terminal import get_terminal_size
1515
from pandas.core.config import get_option, set_option
1616
from pandas.io.common import _get_handle, UnicodeWriter, _expand_user

pandas/io/common.py

+4
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ def readline(self):
146146
except ImportError:
147147
# boto is only needed for reading from S3.
148148
pass
149+
except TypeError:
150+
# boto/boto3 issues
151+
# GH11915
152+
pass
149153

150154

151155
def _is_url(url):

pandas/util/clipboard.py

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
4646
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4747

48+
# flake8: noqa
4849

4950
import platform
5051
import os

pandas/util/print_versions.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ def show_versions(as_json=False):
9191
("sqlalchemy", lambda mod: mod.__version__),
9292
("pymysql", lambda mod: mod.__version__),
9393
("psycopg2", lambda mod: mod.__version__),
94-
("jinja2", lambda mod: mod.__version__)
94+
("jinja2", lambda mod: mod.__version__),
95+
("boto", lambda mod: mod.__version__)
9596
]
9697

9798
deps_blob = list()

0 commit comments

Comments
 (0)