Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into read_excel-docstring
Browse files Browse the repository at this point in the history
* upstream/master:
  DOC: Fixing broken references in the docs (pandas-dev#24497)
  DOC: Splitting api.rst in several files (pandas-dev#24462)
  Fix misdescription in escapechar (pandas-dev#24490)
  Floor and ceil methods during pandas.eval which are provided by numexpr (pandas-dev#24355)
  BUG: Pandas any() returning false with true values present (GH pandas-dev#23070) (pandas-dev#24434)
  Misc separable pieces of pandas-dev#24024 (pandas-dev#24488)
  use capsys.readouterr() as named tuple (pandas-dev#24489)
  REF/TST: replace capture_stderr with pytest capsys fixture (pandas-dev#24496)
  TST- Fixing issue with test_parquet test unexpectedly passing (pandas-dev#24480)
  DOC: Doc build for a single doc made much faster, and clean up (pandas-dev#24428)
  BUG: Fix+test timezone-preservation in DTA.repeat (pandas-dev#24483)
  Implement reductions from pandas-dev#24024 (pandas-dev#24484)
  • Loading branch information
thoo committed Dec 30, 2018
2 parents 868b7d9 + c4ac0d6 commit 51c508c
Show file tree
Hide file tree
Showing 55 changed files with 4,531 additions and 4,605 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ asv_bench/pandas/
# Documentation generated files #
#################################
doc/source/generated
doc/source/api/generated
doc/source/_static
doc/source/vbench
doc/source/vbench.rst
Expand Down
2 changes: 2 additions & 0 deletions ci/deps/azure-macos-35.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ dependencies:
- numexpr
- numpy=1.12.0
- openpyxl=2.5.5
- pyarrow
- fastparquet
- pytables
- python=3.5*
- pytz
Expand Down
Loading

0 comments on commit 51c508c

Please sign in to comment.