Skip to content

Commit 478d08d

Browse files
DOC: updated IO section (pandas-dev#20377)
2 parents 7d5f6b2 + 4efb39f commit 478d08d

File tree

118 files changed

+3892
-3099
lines changed

Some content is hidden

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

118 files changed

+3892
-3099
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ matrix:
5656
# In allow_failures
5757
- dist: trusty
5858
env:
59-
- JOB="2.7_SLOW" SLOW=true
59+
- JOB="3.6_SLOW" SLOW=true
6060
# In allow_failures
6161
- dist: trusty
6262
env:
@@ -72,7 +72,7 @@ matrix:
7272
allow_failures:
7373
- dist: trusty
7474
env:
75-
- JOB="2.7_SLOW" SLOW=true
75+
- JOB="3.6_SLOW" SLOW=true
7676
- dist: trusty
7777
env:
7878
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"

asv_bench/benchmarks/frame_ctor.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ class FromDicts(object):
1616

1717
def setup(self):
1818
N, K = 5000, 50
19-
index = tm.makeStringIndex(N)
20-
columns = tm.makeStringIndex(K)
21-
frame = DataFrame(np.random.randn(N, K), index=index, columns=columns)
19+
self.index = tm.makeStringIndex(N)
20+
self.columns = tm.makeStringIndex(K)
21+
frame = DataFrame(np.random.randn(N, K), index=self.index,
22+
columns=self.columns)
2223
self.data = frame.to_dict()
23-
self.some_dict = list(self.data.values())[0]
2424
self.dict_list = frame.to_dict(orient='records')
2525
self.data2 = {i: {j: float(j) for j in range(100)}
2626
for i in range(2000)}
@@ -31,8 +31,14 @@ def time_list_of_dict(self):
3131
def time_nested_dict(self):
3232
DataFrame(self.data)
3333

34-
def time_dict(self):
35-
Series(self.some_dict)
34+
def time_nested_dict_index(self):
35+
DataFrame(self.data, index=self.index)
36+
37+
def time_nested_dict_columns(self):
38+
DataFrame(self.data, columns=self.columns)
39+
40+
def time_nested_dict_index_columns(self):
41+
DataFrame(self.data, index=self.index, columns=self.columns)
3642

3743
def time_nested_dict_int64(self):
3844
# nested dict, integer indexes, regression described in #621

asv_bench/benchmarks/timeseries.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ def setup(self):
7575
freq='S'))
7676

7777
def time_infer_dst(self):
78-
with warnings.catch_warnings(record=True):
79-
self.index.tz_localize('US/Eastern', infer_dst=True)
78+
self.index.tz_localize('US/Eastern', ambiguous='infer')
8079

8180

8281
class ResetIndex(object):

ci/build_docs.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if [ "$DOC" ]; then
2424
source activate pandas
2525

2626
mv "$TRAVIS_BUILD_DIR"/doc /tmp
27+
mv "$TRAVIS_BUILD_DIR/LICENSE" /tmp # included in the docs.
2728
cd /tmp/doc
2829

2930
echo ###############################
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
python=2.7*
1+
python=3.6*
22
python-dateutil
33
pytz
4-
numpy=1.10*
4+
numpy
55
cython
File renamed without changes.

ci/requirements-2.7_SLOW.run renamed to ci/requirements-3.6_SLOW.run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
python-dateutil
22
pytz
3-
numpy=1.10*
4-
matplotlib=1.4.3
3+
numpy
4+
matplotlib
55
scipy
66
patsy
77
xlwt

doc/source/_static/print_df_new.png

75.4 KB
Loading

doc/source/_static/print_df_old.png

87.1 KB
Loading

doc/source/api.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2557,6 +2557,8 @@ objects.
25572557
generated/pandas.Index.asi8
25582558
generated/pandas.Index.data
25592559
generated/pandas.Index.flags
2560+
generated/pandas.Index.holds_integer
2561+
generated/pandas.Index.is_type_compatible
25602562
generated/pandas.Index.nlevels
25612563
generated/pandas.Index.sort
25622564
generated/pandas.Panel.agg
@@ -2572,4 +2574,5 @@ objects.
25722574
generated/pandas.Series.blocks
25732575
generated/pandas.Series.from_array
25742576
generated/pandas.Series.ix
2575-
generated/pandas.Timestamp.offset
2577+
generated/pandas.Series.imag
2578+
generated/pandas.Series.real

0 commit comments

Comments
 (0)