diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index bd8ba912d5298..05adbf0c924dc 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -10,6 +10,7 @@ dependencies: - jinja2 - lxml - matplotlib + - moto - nomkl - numexpr - numpy @@ -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 diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 43504dec26953..08208d1e2d59a 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -10,6 +10,7 @@ dependencies: - jinja2 - lxml - matplotlib=2.2.* + - moto - numexpr - numpy=1.14.* - openpyxl @@ -29,6 +30,5 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - moto - hypothesis>=3.58.0 - pyreadstat diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index c497495553e8b..fead806fc8e1c 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -12,6 +12,7 @@ dependencies: - geopandas - html5lib - matplotlib + - moto - nomkl - numexpr - numpy=1.15.* @@ -46,6 +47,5 @@ dependencies: - pip: - brotlipy - coverage - - moto - pandas-datareader - python-dateutil diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 75e3348adab7c..0d9a760914dab 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -14,6 +14,7 @@ dependencies: - jinja2 - lxml=3.8.0 - matplotlib=3.0.* + - moto - nomkl - numexpr - numpy @@ -36,7 +37,6 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock - - moto - pip - pip: - hypothesis>=3.58.0 diff --git a/pandas/core/indexes/base.py b/pandas/core/indexes/base.py index 23089cb577bf5..13e672cbc131a 100644 --- a/pandas/core/indexes/base.py +++ b/pandas/core/indexes/base.py @@ -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.