Skip to content

Commit 51c508c

Browse files
committed
Merge remote-tracking branch 'upstream/master' into read_excel-docstring
* 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)
2 parents 868b7d9 + c4ac0d6 commit 51c508c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+4531
-4605
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ asv_bench/pandas/
101101
# Documentation generated files #
102102
#################################
103103
doc/source/generated
104+
doc/source/api/generated
104105
doc/source/_static
105106
doc/source/vbench
106107
doc/source/vbench.rst

ci/deps/azure-macos-35.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ dependencies:
1313
- numexpr
1414
- numpy=1.12.0
1515
- openpyxl=2.5.5
16+
- pyarrow
17+
- fastparquet
1618
- pytables
1719
- python=3.5*
1820
- pytz

0 commit comments

Comments
 (0)