Skip to content

Commit d054c03

Browse files
CI: Install moto from conda-forge (#27163)
* CI: Install moto from conda-forge Closes #27161
1 parent ad2e98c commit d054c03

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

ci/deps/azure-37-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies:
1010
- jinja2
1111
- lxml
1212
- matplotlib
13+
- moto
1314
- nomkl
1415
- numexpr
1516
- numpy
@@ -32,4 +33,3 @@ dependencies:
3233
- pip
3334
- pip:
3435
- hypothesis>=3.58.0
35-
- moto # latest moto in conda-forge fails with 3.7, move to conda dependencies when this is fixed

ci/deps/azure-windows-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies:
1010
- jinja2
1111
- lxml
1212
- matplotlib=2.2.*
13+
- moto
1314
- numexpr
1415
- numpy=1.14.*
1516
- openpyxl
@@ -29,6 +30,5 @@ dependencies:
2930
- pytest-xdist
3031
- pytest-mock
3132
- pytest-azurepipelines
32-
- moto
3333
- hypothesis>=3.58.0
3434
- pyreadstat

ci/deps/travis-36-cov.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies:
1212
- geopandas
1313
- html5lib
1414
- matplotlib
15+
- moto
1516
- nomkl
1617
- numexpr
1718
- numpy=1.15.*
@@ -46,6 +47,5 @@ dependencies:
4647
- pip:
4748
- brotlipy
4849
- coverage
49-
- moto
5050
- pandas-datareader
5151
- python-dateutil

ci/deps/travis-36-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
- jinja2
1515
- lxml=3.8.0
1616
- matplotlib=3.0.*
17+
- moto
1718
- nomkl
1819
- numexpr
1920
- numpy
@@ -36,7 +37,6 @@ dependencies:
3637
- pytest>=4.0.2
3738
- pytest-xdist
3839
- pytest-mock
39-
- moto
4040
- pip
4141
- pip:
4242
- hypothesis>=3.58.0

pandas/core/indexes/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ def dtype(self):
679679
"""
680680
return self._data.dtype
681681

682-
@cache_readonly
682+
@property
683683
def dtype_str(self):
684684
"""
685685
Return the dtype str of the underlying data.

0 commit comments

Comments
 (0)