Skip to content

Commit d36394c

Browse files
committed
Merge remote-tracking branch 'upstream/master' into excel-related-docstrings
* upstream/master: TST: Skip db tests unless explicitly specified in -m pattern (pandas-dev#24492) Mix EA into DTA/TDA; part of 24024 (pandas-dev#24502) DOC: Fix building of a single API document (pandas-dev#24506) 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 d16fd68 + 43c4dcd commit d36394c

Some content is hidden

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

61 files changed

+4624
-4643
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

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ matrix:
3434
include:
3535
- dist: trusty
3636
env:
37-
- JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="not slow and not network and not db"
37+
- JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="not slow and not network"
3838

3939
- dist: trusty
4040
env:
41-
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="not slow"
41+
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="not slow and db"
4242
addons:
4343
apt:
4444
packages:
4545
- python-gtk2
4646

4747
- dist: trusty
4848
env:
49-
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="not slow and not network" LOCALE_OVERRIDE="zh_CN.UTF-8"
49+
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="not slow and not network and db" LOCALE_OVERRIDE="zh_CN.UTF-8"
5050

5151
- dist: trusty
5252
env:
53-
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
53+
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network and db" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
5454

5555
# In allow_failures
5656
- dist: trusty

ci/azure/posix.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,37 @@ jobs:
1212
py35_np_120:
1313
ENV_FILE: ci/deps/azure-macos-35.yaml
1414
CONDA_PY: "35"
15-
PATTERN: "not slow and not network and not db"
15+
PATTERN: "not slow and not network"
1616

1717
${{ if eq(parameters.name, 'Linux') }}:
1818
py27_np_120:
1919
ENV_FILE: ci/deps/azure-27-compat.yaml
2020
CONDA_PY: "27"
21-
PATTERN: "not slow and not network and not db"
21+
PATTERN: "not slow and not network"
2222

2323
py27_locale_slow_old_np:
2424
ENV_FILE: ci/deps/azure-27-locale.yaml
2525
CONDA_PY: "27"
26-
PATTERN: "slow and not db"
26+
PATTERN: "slow"
2727
LOCALE_OVERRIDE: "zh_CN.UTF-8"
2828
EXTRA_APT: "language-pack-zh-hans"
2929

3030
py36_locale_slow:
3131
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
3232
CONDA_PY: "36"
33-
PATTERN: "not slow and not network and not db"
33+
PATTERN: "not slow and not network"
3434
LOCALE_OVERRIDE: "it_IT.UTF-8"
3535

3636
py37_locale:
3737
ENV_FILE: ci/deps/azure-37-locale.yaml
3838
CONDA_PY: "37"
39-
PATTERN: "not slow and not network and not db"
39+
PATTERN: "not slow and not network"
4040
LOCALE_OVERRIDE: "zh_CN.UTF-8"
4141

4242
py37_np_dev:
4343
ENV_FILE: ci/deps/azure-37-numpydev.yaml
4444
CONDA_PY: "37"
45-
PATTERN: "not slow and not network and not db"
45+
PATTERN: "not slow and not network"
4646
TEST_ARGS: "-W error"
4747
PANDAS_TESTING_MODE: "deprecate"
4848
EXTRA_APT: "xsel"

ci/azure/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
displayName: 'Build'
3939
- script: |
4040
call activate pandas-dev
41-
pytest -m "not slow and not network and not db" --junitxml=test-data.xml pandas -n 2 -r sxX --strict --durations=10 %*
41+
pytest -m "not slow and not network" --junitxml=test-data.xml pandas -n 2 -r sxX --strict --durations=10 %*
4242
displayName: 'Test'
4343
- task: PublishTestResults@2
4444
inputs:

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)