Skip to content

Commit dae29ef

Browse files
Merge branch 'master' into master
2 parents 1f7c047 + 9285820 commit dae29ef

File tree

193 files changed

+7158
-4636
lines changed

Some content is hidden

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

193 files changed

+7158
-4636
lines changed

.pep8speaks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ pycodestyle:
1111
max-line-length: 79
1212
ignore:
1313
- W503, # line break before binary operator
14+
- W504, # line break after binary operator
1415
- E402, # module level import not at top of file
1516
- E722, # do not use bare except
1617
- E731, # do not assign a lambda expression, use a def
17-
- E741, # ambiguous variable name 'l'
1818
- C406, # Unnecessary list literal - rewrite as a dict literal.
1919
- C408, # Unnecessary dict call - rewrite as a literal.
2020
- C409 # Unnecessary list passed to tuple() - rewrite as a tuple literal.

asv_bench/benchmarks/indexing.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
import numpy as np
44
import pandas.util.testing as tm
5-
from pandas import (Series, DataFrame, MultiIndex, Int64Index, Float64Index,
6-
IntervalIndex, CategoricalIndex,
5+
from pandas import (Series, DataFrame, Panel, MultiIndex, Int64Index,
6+
Float64Index, IntervalIndex, CategoricalIndex,
77
IndexSlice, concat, date_range)
8-
from .pandas_vb_common import Panel
98

109

1110
class NumericSeriesIndexing(object):

asv_bench/benchmarks/join_merge.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
except ImportError:
1212
from pandas import ordered_merge as merge_ordered
1313

14-
from .pandas_vb_common import Panel
15-
1614

1715
class Append(object):
1816

asv_bench/benchmarks/panel_ctor.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
from pandas import DataFrame, Panel, DatetimeIndex, date_range
55

6-
from .pandas_vb_common import Panel
7-
86

97
class DifferentIndexes(object):
108
goal_time = 0.2

asv_bench/benchmarks/panel_methods.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
from pandas import Panel
55

6-
from .pandas_vb_common import Panel
7-
86

97
class PanelMethods(object):
108

asv_bench/benchmarks/period.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,6 @@ def time_align(self):
119119

120120
def time_intersection(self):
121121
self.index[:750].intersection(self.index[250:])
122+
123+
def time_unique(self):
124+
self.index.unique()

ci/azure-macos-35.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dependencies:
88
- html5lib
99
- jinja2
1010
- lxml
11-
- matplotlib
11+
- matplotlib=2.2.0
1212
- nomkl
1313
- numexpr
14-
- numpy=1.10.4
14+
- numpy=1.12.0
1515
- openpyxl=2.5.5
1616
- pytables
1717
- python=3.5*

ci/azure-windows-27.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- html5lib
1111
- jinja2=2.8
1212
- lxml
13-
- matplotlib
13+
- matplotlib=2.0.1
1414
- numexpr
1515
- numpy=1.12*
1616
- openpyxl=2.5.5

ci/azure/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
maxParallel: 11
1111
matrix:
12-
py35_np_110:
12+
py35_np_120:
1313
ENV_FILE: ci/azure-macos-35.yaml
1414
CONDA_PY: "35"
1515
CONDA_ENV: pandas

ci/azure/windows-py27.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
maxParallel: 11
1111
matrix:
12-
py36_np14:
12+
py36_np121:
1313
ENV_FILE: ci/azure-windows-27.yaml
1414
CONDA_PY: "27"
1515
CONDA_ENV: pandas

0 commit comments

Comments
 (0)