Skip to content

Commit 01866bc

Browse files
kprestelkprestel
committed
Merge branch 'master' of https://github.com/pandas-dev/pandas into ea-types-read-csv
2 parents 0151eb0 + d78bd7a commit 01866bc

File tree

482 files changed

+9127
-6481
lines changed

Some content is hidden

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

482 files changed

+9127
-6481
lines changed

‎.circleci/config.yml

+3-108
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,6 @@
11
version: 2
22
jobs:
33

4-
# --------------------------------------------------------------------------
5-
# 0. py27_compat
6-
# --------------------------------------------------------------------------
7-
py27_compat:
8-
docker:
9-
- image: continuumio/miniconda:latest
10-
# databases configuration
11-
- image: circleci/postgres:9.6.5-alpine-ram
12-
environment:
13-
POSTGRES_USER: postgres
14-
POSTGRES_DB: pandas_nosetest
15-
- image: circleci/mysql:8-ram
16-
environment:
17-
MYSQL_USER: "root"
18-
MYSQL_HOST: "localhost"
19-
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
20-
MYSQL_DATABASE: "pandas_nosetest"
21-
environment:
22-
JOB: "2.7_COMPAT"
23-
ENV_FILE: "ci/circle-27-compat.yaml"
24-
LOCALE_OVERRIDE: "it_IT.UTF-8"
25-
MINICONDA_DIR: /home/ubuntu/miniconda3
26-
steps:
27-
- checkout
28-
- run:
29-
name: build
30-
command: |
31-
./ci/install_circle.sh
32-
./ci/show_circle.sh
33-
- run:
34-
name: test
35-
command: ./ci/run_circle.sh --skip-slow --skip-network
36-
374
# --------------------------------------------------------------------------
385
# 1. py36_locale
396
# --------------------------------------------------------------------------
@@ -62,86 +29,14 @@ jobs:
6229
- run:
6330
name: build
6431
command: |
65-
./ci/install_circle.sh
66-
./ci/show_circle.sh
32+
./ci/circle/install_circle.sh
33+
./ci/circle/show_circle.sh
6734
- run:
6835
name: test
69-
command: ./ci/run_circle.sh --skip-slow --skip-network
70-
71-
# --------------------------------------------------------------------------
72-
# 2. py36_locale_slow
73-
# --------------------------------------------------------------------------
74-
py36_locale_slow:
75-
docker:
76-
- image: continuumio/miniconda:latest
77-
# databases configuration
78-
- image: circleci/postgres:9.6.5-alpine-ram
79-
environment:
80-
POSTGRES_USER: postgres
81-
POSTGRES_DB: pandas_nosetest
82-
- image: circleci/mysql:8-ram
83-
environment:
84-
MYSQL_USER: "root"
85-
MYSQL_HOST: "localhost"
86-
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
87-
MYSQL_DATABASE: "pandas_nosetest"
88-
89-
environment:
90-
JOB: "3.6_LOCALE_SLOW"
91-
ENV_FILE: "ci/circle-36-locale_slow.yaml"
92-
LOCALE_OVERRIDE: "zh_CN.UTF-8"
93-
MINICONDA_DIR: /home/ubuntu/miniconda3
94-
steps:
95-
- checkout
96-
- run:
97-
name: build
98-
command: |
99-
./ci/install_circle.sh
100-
./ci/show_circle.sh
101-
- run:
102-
name: test
103-
command: ./ci/run_circle.sh --only-slow --skip-network
104-
105-
# --------------------------------------------------------------------------
106-
# 3. py35_ascii
107-
# --------------------------------------------------------------------------
108-
py35_ascii:
109-
docker:
110-
- image: continuumio/miniconda:latest
111-
# databases configuration
112-
- image: circleci/postgres:9.6.5-alpine-ram
113-
environment:
114-
POSTGRES_USER: postgres
115-
POSTGRES_DB: pandas_nosetest
116-
- image: circleci/mysql:8-ram
117-
environment:
118-
MYSQL_USER: "root"
119-
MYSQL_HOST: "localhost"
120-
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
121-
MYSQL_DATABASE: "pandas_nosetest"
122-
123-
environment:
124-
JOB: "3.5_ASCII"
125-
ENV_FILE: "ci/circle-35-ascii.yaml"
126-
LOCALE_OVERRIDE: "C"
127-
MINICONDA_DIR: /home/ubuntu/miniconda3
128-
steps:
129-
- checkout
130-
- run:
131-
name: build
132-
command: |
133-
./ci/install_circle.sh
134-
./ci/show_circle.sh
135-
- run:
136-
name: test
137-
command: ./ci/run_circle.sh --skip-slow --skip-network
138-
36+
command: ./ci/circle/run_circle.sh --skip-slow --skip-network
13937

14038
workflows:
14139
version: 2
14240
build_and_test:
14341
jobs:
144-
- py27_compat
14542
- py36_locale
146-
- py36_locale_slow
147-
- py35_ascii

‎.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ after_success:
116116
after_script:
117117
- echo "after_script start"
118118
- source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
119-
- if [ -e /tmp/single.xml ]; then
120-
ci/print_skipped.py /tmp/single.xml;
119+
- if [ -e test-data-single.xml ]; then
120+
ci/print_skipped.py test-data-single.xml;
121121
fi
122-
- if [ -e /tmp/multiple.xml ]; then
123-
ci/print_skipped.py /tmp/multiple.xml;
122+
- if [ -e test-data-multiple.xml ]; then
123+
ci/print_skipped.py test-data-multiple.xml;
124124
fi
125125
- echo "after_script done"

‎asv_bench/benchmarks/algorithms.py

-10
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
class Factorize(object):
1717

18-
goal_time = 0.2
19-
2018
params = [True, False]
2119
param_names = ['sort']
2220

@@ -38,8 +36,6 @@ def time_factorize_string(self, sort):
3836

3937
class Duplicated(object):
4038

41-
goal_time = 0.2
42-
4339
params = ['first', 'last', False]
4440
param_names = ['keep']
4541

@@ -61,8 +57,6 @@ def time_duplicated_string(self, keep):
6157

6258
class DuplicatedUniqueIndex(object):
6359

64-
goal_time = 0.2
65-
6660
def setup(self):
6761
N = 10**5
6862
self.idx_int_dup = pd.Int64Index(np.arange(N * 5))
@@ -75,8 +69,6 @@ def time_duplicated_unique_int(self):
7569

7670
class Match(object):
7771

78-
goal_time = 0.2
79-
8072
def setup(self):
8173
self.uniques = tm.makeStringIndex(1000).values
8274
self.all = self.uniques.repeat(10)
@@ -88,8 +80,6 @@ def time_match_string(self):
8880

8981
class Hashing(object):
9082

91-
goal_time = 0.2
92-
9383
def setup_cache(self):
9484
N = 10**5
9585

‎asv_bench/benchmarks/attrs_caching.py

-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
class DataFrameAttributes(object):
1010

11-
goal_time = 0.2
12-
1311
def setup(self):
1412
self.df = DataFrame(np.random.randn(10, 6))
1513
self.cur_index = self.df.index
@@ -23,8 +21,6 @@ def time_set_index(self):
2321

2422
class CacheReadonly(object):
2523

26-
goal_time = 0.2
27-
2824
def setup(self):
2925

3026
class Foo:

‎asv_bench/benchmarks/binary_ops.py

-10
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
class Ops(object):
1111

12-
goal_time = 0.2
13-
1412
params = [[True, False], ['default', 1]]
1513
param_names = ['use_numexpr', 'threads']
1614

@@ -42,8 +40,6 @@ def teardown(self, use_numexpr, threads):
4240

4341
class Ops2(object):
4442

45-
goal_time = 0.2
46-
4743
def setup(self):
4844
N = 10**3
4945
self.df = DataFrame(np.random.randn(N, N))
@@ -81,8 +77,6 @@ def time_frame_float_mod(self):
8177

8278
class Timeseries(object):
8379

84-
goal_time = 0.2
85-
8680
params = [None, 'US/Eastern']
8781
param_names = ['tz']
8882

@@ -109,8 +103,6 @@ def time_timestamp_ops_diff_with_shift(self, tz):
109103

110104
class AddOverflowScalar(object):
111105

112-
goal_time = 0.2
113-
114106
params = [1, -1, 0]
115107
param_names = ['scalar']
116108

@@ -124,8 +116,6 @@ def time_add_overflow_scalar(self, scalar):
124116

125117
class AddOverflowArray(object):
126118

127-
goal_time = 0.2
128-
129119
def setup(self):
130120
N = 10**6
131121
self.arr = np.arange(N)

‎asv_bench/benchmarks/categoricals.py

-17
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
class Concat(object):
1616

17-
goal_time = 0.2
18-
1917
def setup(self):
2018
N = 10**5
2119
self.s = pd.Series(list('aabbcd') * N).astype('category')
@@ -32,8 +30,6 @@ def time_union(self):
3230

3331
class Constructor(object):
3432

35-
goal_time = 0.2
36-
3733
def setup(self):
3834
N = 10**5
3935
self.categories = list('abcde')
@@ -75,8 +71,6 @@ def time_from_codes_all_int8(self):
7571

7672
class ValueCounts(object):
7773

78-
goal_time = 0.2
79-
8074
params = [True, False]
8175
param_names = ['dropna']
8276

@@ -91,8 +85,6 @@ def time_value_counts(self, dropna):
9185

9286
class Repr(object):
9387

94-
goal_time = 0.2
95-
9688
def setup(self):
9789
self.sel = pd.Series(['s1234']).astype('category')
9890

@@ -102,8 +94,6 @@ def time_rendering(self):
10294

10395
class SetCategories(object):
10496

105-
goal_time = 0.2
106-
10797
def setup(self):
10898
n = 5 * 10**5
10999
arr = ['s%04d' % i for i in np.random.randint(0, n // 10, size=n)]
@@ -115,8 +105,6 @@ def time_set_categories(self):
115105

116106
class Rank(object):
117107

118-
goal_time = 0.2
119-
120108
def setup(self):
121109
N = 10**5
122110
ncats = 100
@@ -154,8 +142,6 @@ def time_rank_int_cat_ordered(self):
154142

155143
class Isin(object):
156144

157-
goal_time = 0.2
158-
159145
params = ['object', 'int64']
160146
param_names = ['dtype']
161147

@@ -195,8 +181,6 @@ def time_categorical_series_is_monotonic_decreasing(self):
195181

196182
class Contains(object):
197183

198-
goal_time = 0.2
199-
200184
def setup(self):
201185
N = 10**5
202186
self.ci = tm.makeCategoricalIndex(N)
@@ -212,7 +196,6 @@ def time_categorical_contains(self):
212196

213197
class CategoricalSlicing(object):
214198

215-
goal_time = 0.2
216199
params = ['monotonic_incr', 'monotonic_decr', 'non_monotonic']
217200
param_names = ['index']
218201

‎asv_bench/benchmarks/ctors.py

-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
class SeriesConstructors(object):
77

8-
goal_time = 0.2
9-
108
param_names = ["data_fmt", "with_index"]
119
params = [[lambda x: x,
1210
list,
@@ -30,8 +28,6 @@ def time_series_constructor(self, data_fmt, with_index):
3028

3129
class SeriesDtypesConstructors(object):
3230

33-
goal_time = 0.2
34-
3531
def setup(self):
3632
N = 10**4
3733
self.arr = np.random.randn(N, N)
@@ -54,8 +50,6 @@ def time_dtindex_from_index_with_series(self):
5450

5551
class MultiIndexConstructor(object):
5652

57-
goal_time = 0.2
58-
5953
def setup(self):
6054
N = 10**4
6155
self.iterables = [tm.makeStringIndex(N), range(20)]

‎asv_bench/benchmarks/eval.py

-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
class Eval(object):
1010

11-
goal_time = 0.2
12-
1311
params = [['numexpr', 'python'], [1, 'all']]
1412
param_names = ['engine', 'threads']
1513

@@ -41,8 +39,6 @@ def teardown(self, engine, threads):
4139

4240
class Query(object):
4341

44-
goal_time = 0.2
45-
4642
def setup(self):
4743
N = 10**6
4844
halfway = (N // 2) - 1

0 commit comments

Comments
 (0)