Skip to content

Commit 4f53e80

Browse files
committed
Merge master
2 parents aa4722c + a1fee91 commit 4f53e80

File tree

475 files changed

+6446
-7713
lines changed

Some content is hidden

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

475 files changed

+6446
-7713
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ dist
6161
.coverage
6262
coverage.xml
6363
coverage_html_report
64+
.mypy_cache
6465
*.pytest_cache
6566
# hypothesis test database
6667
.hypothesis/

.travis.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ matrix:
4141

4242
- dist: trusty
4343
env:
44-
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
44+
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
4545

4646
# In allow_failures
4747
- dist: trusty
@@ -82,15 +82,10 @@ before_install:
8282
install:
8383
- echo "install start"
8484
- ci/prep_cython_cache.sh
85-
- ci/install_travis.sh
85+
- ci/setup_env.sh
8686
- ci/submit_cython_cache.sh
8787
- echo "install done"
8888

89-
before_script:
90-
- ci/install_db_travis.sh
91-
- export DISPLAY=":99.0"
92-
- ci/before_script_travis.sh
93-
9489
script:
9590
- echo "script start"
9691
- source activate pandas-dev

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ pip install pandas
164164
```
165165

166166
## Dependencies
167-
- [NumPy](https://www.numpy.org): 1.12.0 or higher
167+
- [NumPy](https://www.numpy.org): 1.13.3 or higher
168168
- [python-dateutil](https://labix.org/python-dateutil): 2.5.0 or higher
169169
- [pytz](https://pythonhosted.org/pytz): 2015.4 or higher
170170

asv_bench/benchmarks/io/csv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import numpy as np
55
import pandas.util.testing as tm
66
from pandas import DataFrame, Categorical, date_range, read_csv
7-
from pandas.compat import cStringIO as StringIO
7+
from io import StringIO
88

99
from ..pandas_vb_common import BaseIO
1010

asv_bench/benchmarks/io/excel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
from io import BytesIO
12
import numpy as np
23
from pandas import DataFrame, date_range, ExcelWriter, read_excel
3-
from pandas.compat import BytesIO
44
import pandas.util.testing as tm
55

66

asv_bench/benchmarks/rolling.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,20 @@ def time_quantile(self, constructor, window, dtype, percentile,
113113
self.roll.quantile(percentile, interpolation=interpolation)
114114

115115

116+
class PeakMemFixed(object):
117+
118+
def setup(self):
119+
N = 10
120+
arr = 100 * np.random.random(N)
121+
self.roll = pd.Series(arr).rolling(10)
122+
123+
def peakmem_fixed(self):
124+
# GH 25926
125+
# This is to detect memory leaks in rolling operations.
126+
# To save time this is only ran on one method.
127+
# 6000 iterations is enough for most types of leaks to be detected
128+
for x in range(6000):
129+
self.roll.max()
130+
131+
116132
from .pandas_vb_common import setup # noqa: F401

azure-pipelines.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ jobs:
3939
- script: |
4040
export PATH=$HOME/miniconda3/bin:$PATH
4141
sudo apt-get install -y libc6-dev-i386
42-
ci/incremental/install_miniconda.sh
43-
ci/incremental/setup_conda_environment.sh
44-
displayName: 'Set up environment'
42+
ci/setup_env.sh
43+
displayName: 'Setup environment and build pandas'
4544
condition: true
4645
4746
# Do not require pandas
@@ -59,13 +58,6 @@ jobs:
5958
displayName: 'Dependencies consistency'
6059
condition: true
6160
62-
- script: |
63-
export PATH=$HOME/miniconda3/bin:$PATH
64-
source activate pandas-dev
65-
ci/incremental/build.sh
66-
displayName: 'Build'
67-
condition: true
68-
6961
# Require pandas
7062
- script: |
7163
export PATH=$HOME/miniconda3/bin:$PATH
@@ -88,6 +80,13 @@ jobs:
8880
displayName: 'Docstring validation'
8981
condition: true
9082
83+
- script: |
84+
export PATH=$HOME/miniconda3/bin:$PATH
85+
source activate pandas-dev
86+
ci/code_checks.sh typing
87+
displayName: 'Typing validation'
88+
condition: true
89+
9190
- script: |
9291
export PATH=$HOME/miniconda3/bin:$PATH
9392
source activate pandas-dev

ci/azure/posix.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@ jobs:
1515
PATTERN: "not slow and not network"
1616

1717
${{ if eq(parameters.name, 'Linux') }}:
18+
py35_compat:
19+
ENV_FILE: ci/deps/azure-35-compat.yaml
20+
CONDA_PY: "35"
21+
PATTERN: "not slow and not network"
22+
23+
py36_locale_slow_old_np:
24+
ENV_FILE: ci/deps/azure-36-locale.yaml
25+
CONDA_PY: "36"
26+
PATTERN: "slow"
27+
LOCALE_OVERRIDE: "zh_CN.UTF-8"
28+
EXTRA_APT: "language-pack-zh-hans"
29+
1830
py36_locale_slow:
1931
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
2032
CONDA_PY: "36"
@@ -38,17 +50,9 @@ jobs:
3850
steps:
3951
- script: |
4052
if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
41-
echo "Installing Miniconda"
42-
ci/incremental/install_miniconda.sh
43-
export PATH=$HOME/miniconda3/bin:$PATH
44-
echo "Setting up Conda environment"
45-
ci/incremental/setup_conda_environment.sh
46-
displayName: 'Before Install'
47-
- script: |
48-
export PATH=$HOME/miniconda3/bin:$PATH
49-
source activate pandas-dev
50-
ci/incremental/build.sh
51-
displayName: 'Build'
53+
echo "Creating Environment"
54+
ci/setup_env.sh
55+
displayName: 'Setup environment and build pandas'
5256
- script: |
5357
export PATH=$HOME/miniconda3/bin:$PATH
5458
source activate pandas-dev

ci/azure/windows.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ jobs:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
1010
matrix:
11-
py36_np14:
11+
py36_np15:
1212
ENV_FILE: ci/deps/azure-windows-36.yaml
1313
CONDA_PY: "36"
1414

15+
py37_np141:
16+
ENV_FILE: ci/deps/azure-windows-37.yaml
17+
CONDA_PY: "37"
18+
1519
steps:
1620
- task: CondaEnvironment@1
1721
inputs:

ci/before_script_travis.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)