Skip to content

Commit cdb9ebc

Browse files
committed
Merge branch 'master' into feature/groupby-repr-ellipses-1135
2 parents c74cbba + 9d66bdf commit cdb9ebc

File tree

196 files changed

+2149
-2130
lines changed

Some content is hidden

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

196 files changed

+2149
-2130
lines changed

.travis.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -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

asv_bench/benchmarks/io/csv.py

+1-1
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

+1-1
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

+16
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

+2-10
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

ci/azure/posix.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,9 @@ jobs:
5050
steps:
5151
- script: |
5252
if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
53-
echo "Installing Miniconda"
54-
ci/incremental/install_miniconda.sh
55-
export PATH=$HOME/miniconda3/bin:$PATH
56-
echo "Setting up Conda environment"
57-
ci/incremental/setup_conda_environment.sh
58-
displayName: 'Before Install'
59-
- script: |
60-
export PATH=$HOME/miniconda3/bin:$PATH
61-
source activate pandas-dev
62-
ci/incremental/build.sh
63-
displayName: 'Build'
53+
echo "Creating Environment"
54+
ci/setup_env.sh
55+
displayName: 'Setup environment and build pandas'
6456
- script: |
6557
export PATH=$HOME/miniconda3/bin:$PATH
6658
source activate pandas-dev

ci/before_script_travis.sh

-11
This file was deleted.

ci/code_checks.sh

+2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@ fi
111111
if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
112112

113113
# Check for imports from pandas.core.common instead of `import pandas.core.common as com`
114+
# Check for imports from collections.abc instead of `from collections import abc`
114115
MSG='Check for non-standard imports' ; echo $MSG
115116
invgrep -R --include="*.py*" -E "from pandas.core.common import " pandas
117+
invgrep -R --include="*.py*" -E "from collections.abc import " pandas
116118
# invgrep -R --include="*.py*" -E "from numpy import nan " pandas # GH#24822 not yet implemented since the offending imports have not all been removed
117119
RET=$(($RET + $?)) ; echo $MSG "DONE"
118120

ci/deps/azure-35-compat.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies:
2323
- pytest-xdist
2424
- pytest-mock
2525
- isort
26+
- pip
2627
- pip:
2728
# for python 3.5, pytest>=4.0.2 is not available in conda
2829
- pytest>=4.0.2

ci/deps/azure-36-locale.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ dependencies:
2525
- pytest-mock
2626
- hypothesis>=3.58.0
2727
- isort
28+
- pip
2829
- pip:
2930
- html5lib==1.0b2

ci/deps/azure-36-locale_slow.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ dependencies:
3131
- pytest-mock
3232
- moto
3333
- isort
34+
- pip
3435
- pip:
3536
- hypothesis>=3.58.0

ci/deps/azure-37-locale.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies:
2929
- pytest-xdist
3030
- pytest-mock
3131
- isort
32+
- pip
3233
- pip:
3334
- hypothesis>=3.58.0
3435
- moto # latest moto in conda-forge fails with 3.7, move to conda dependencies when this is fixed

ci/deps/azure-37-numpydev.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies:
1111
- pytest-mock
1212
- hypothesis>=3.58.0
1313
- isort
14+
- pip
1415
- pip:
1516
- "git+git://github.com/dateutil/dateutil.git"
1617
- "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"

ci/deps/travis-36-cov.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ dependencies:
1717
- numpy=1.15.*
1818
- openpyxl
1919
- pandas-gbq
20+
# https://github.com/pydata/pandas-gbq/issues/271
21+
- google-cloud-bigquery<=1.11
2022
- psycopg2
2123
- pyarrow=0.9.0
22-
# add pydata-google-auth until for pandas-gbq, see
23-
# https://github.com/conda-forge/pandas-gbq-feedstock/issues/18
24-
- pydata-google-auth
2524
- pymysql
2625
- pytables
2726
- python-snappy
@@ -43,6 +42,7 @@ dependencies:
4342
- pytest-mock
4443
- hypothesis>=3.58.0
4544
- isort
45+
- pip
4646
- pip:
4747
- brotlipy
4848
- coverage

ci/deps/travis-36-locale.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ dependencies:
4040
- pytest-mock
4141
- moto
4242
- isort
43+
- pip
4344
- pip:
4445
- hypothesis>=3.58.0

ci/deps/travis-37.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ dependencies:
1212
- nomkl
1313
- pyarrow
1414
- pytz
15+
# universal
1516
- pytest>=4.0.2
1617
- pytest-xdist
1718
- pytest-mock
1819
- hypothesis>=3.58.0
1920
- s3fs
2021
- isort
22+
- pip
2123
- pip:
2224
- moto

ci/incremental/build.sh

-16
This file was deleted.

ci/incremental/install_miniconda.sh

-19
This file was deleted.

ci/incremental/setup_conda_environment.sh

-52
This file was deleted.

ci/install_db_travis.sh

-13
This file was deleted.

0 commit comments

Comments
 (0)