Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Install moto from conda-forge #27163

Merged
merged 2 commits into from
Jul 1, 2019
Merged

CI: Install moto from conda-forge #27163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993c048
CI: Install moto from conda-forge
TomAugspurger Jul 1, 2019
b130eac
Fix test dependency by removing cache
TomAugspurger Jul 1, 2019
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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