Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- jinja2
- lxml
- matplotlib
- moto
- nomkl
- numexpr
- numpy
Expand All @@ -32,4 +33,3 @@ dependencies:
- pip
- pip:
- hypothesis>=3.58.0
- moto # latest moto in conda-forge fails with 3.7, move to conda dependencies when this is fixed
2 changes: 1 addition & 1 deletion ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- jinja2
- lxml
- matplotlib=2.2.*
- moto
- numexpr
- numpy=1.14.*
- openpyxl
Expand All @@ -29,6 +30,5 @@ dependencies:
- pytest-xdist
- pytest-mock
- pytest-azurepipelines
- moto
- hypothesis>=3.58.0
- pyreadstat
2 changes: 1 addition & 1 deletion ci/deps/travis-36-cov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- geopandas
- html5lib
- matplotlib
- moto
- nomkl
- numexpr
- numpy=1.15.*
Expand Down Expand Up @@ -46,6 +47,5 @@ dependencies:
- pip:
- brotlipy
- coverage
- moto
- pandas-datareader
- python-dateutil
2 changes: 1 addition & 1 deletion ci/deps/travis-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- jinja2
- lxml=3.8.0
- matplotlib=3.0.*
- moto
- nomkl
- numexpr
- numpy
Expand All @@ -36,7 +37,6 @@ dependencies:
- pytest>=4.0.2
- pytest-xdist
- pytest-mock
- moto
- pip
- pip:
- hypothesis>=3.58.0
2 changes: 1 addition & 1 deletion pandas/core/indexes/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ def dtype(self):
"""
return self._data.dtype

@cache_readonly
@property
def dtype_str(self):
"""
Return the dtype str of the underlying data.
Expand Down