Skip to content

Commit 63c2aef

Browse files
committed
Merge remote-tracking branch 'upstream/master' into series-dtype-doc
* upstream/master: (26 commits) DOC: Fixing doc upload (no such remote origin) (pandas-dev#24459) BLD: for C extension builds on mac, target macOS 10.9 where possible (pandas-dev#24274) POC: _eadata (pandas-dev#24394) DOC: Correct location (pandas-dev#24456) CI: Moving CircleCI build to Travis (pandas-dev#24449) BUG: Infer compression by default in read_fwf() (pandas-dev#22200) DOC: Fix minor typo in whatsnew (pandas-dev#24453) DOC: Add dateutil to intersphinx pandas-dev#24437 (pandas-dev#24443) DOC: Adding links to offset classes in timeseries.rst (pandas-dev#24448) DOC: Adding offsets to API ref (pandas-dev#24446) DOC: fix flake8 issue in groupby.rst (pandas-dev#24363) DOC: Fixing more doc warnings (pandas-dev#24438) API: Simplify repeat signature (pandas-dev#24447) BUG: to_datetime(Timestamp, utc=True) localizes to UTC (pandas-dev#24441) CLN: Cython Py2/3 Compatible Imports (pandas-dev#23940) DOC: Fixing more doc warnings (pandas-dev#24431) DOC: Removing old release.rst (pandas-dev#24427) BUG-24408 Series.dt does not maintain own copy of index (pandas-dev#24426) DOC: Fixing several doc warnings (pandas-dev#24430) ENH: fill_value argument for shift pandas-dev#15486 (pandas-dev#24128) ...
2 parents 94459cd + aa1549f commit 63c2aef

File tree

118 files changed

+2648
-7511
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

+2648
-7511
lines changed

.circleci/config.yml

-38
This file was deleted.

.travis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,23 @@ matrix:
4343
apt:
4444
packages:
4545
- language-pack-zh-hans
46+
4647
- dist: trusty
4748
env:
4849
- JOB="2.7" ENV_FILE="ci/deps/travis-27.yaml" PATTERN="not slow"
4950
addons:
5051
apt:
5152
packages:
5253
- python-gtk2
54+
55+
- dist: trusty
56+
env:
57+
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="not slow and not network" LOCALE_OVERRIDE="zh_CN.UTF-8"
58+
5359
- dist: trusty
5460
env:
5561
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36.yaml" PATTERN="not slow and not network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
62+
5663
- dist: trusty
5764
env:
5865
- JOB="3.7, NumPy dev" ENV_FILE="ci/deps/travis-37-numpydev.yaml" PATTERN="not slow and not network" TEST_ARGS="-W error" PANDAS_TESTING_MODE="deprecate"

README.md

-8
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@
4545
</a>
4646
</td>
4747
</tr>
48-
<tr>
49-
<td></td>
50-
<td>
51-
<a href="https://circleci.com/gh/pandas-dev/pandas">
52-
<img src="https://circleci.com/gh/circleci/mongofinil/tree/master.svg?style=shield&circle-token=223d8cafa7b02902c3e150242520af8944e34671" alt="circleci build status" />
53-
</a>
54-
</td>
55-
</tr>
5648
<tr>
5749
<td></td>
5850
<td>

asv_bench/benchmarks/frame_methods.py

+62-1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ def setup(self):
103103
self.df2 = DataFrame(np.random.randn(N * 50, 10))
104104
self.df3 = DataFrame(np.random.randn(N, 5 * N),
105105
columns=['C' + str(c) for c in range(N * 5)])
106+
self.df4 = DataFrame(np.random.randn(N * 1000, 10))
106107

107108
def time_iteritems(self):
108109
# (monitor no-copying behaviour)
@@ -119,10 +120,70 @@ def time_iteritems_indexing(self):
119120
for col in self.df3:
120121
self.df3[col]
121122

123+
def time_itertuples_start(self):
124+
self.df4.itertuples()
125+
126+
def time_itertuples_read_first(self):
127+
next(self.df4.itertuples())
128+
122129
def time_itertuples(self):
123-
for row in self.df2.itertuples():
130+
for row in self.df4.itertuples():
131+
pass
132+
133+
def time_itertuples_to_list(self):
134+
list(self.df4.itertuples())
135+
136+
def mem_itertuples_start(self):
137+
return self.df4.itertuples()
138+
139+
def peakmem_itertuples_start(self):
140+
self.df4.itertuples()
141+
142+
def mem_itertuples_read_first(self):
143+
return next(self.df4.itertuples())
144+
145+
def peakmem_itertuples(self):
146+
for row in self.df4.itertuples():
147+
pass
148+
149+
def mem_itertuples_to_list(self):
150+
return list(self.df4.itertuples())
151+
152+
def peakmem_itertuples_to_list(self):
153+
list(self.df4.itertuples())
154+
155+
def time_itertuples_raw_start(self):
156+
self.df4.itertuples(index=False, name=None)
157+
158+
def time_itertuples_raw_read_first(self):
159+
next(self.df4.itertuples(index=False, name=None))
160+
161+
def time_itertuples_raw_tuples(self):
162+
for row in self.df4.itertuples(index=False, name=None):
124163
pass
125164

165+
def time_itertuples_raw_tuples_to_list(self):
166+
list(self.df4.itertuples(index=False, name=None))
167+
168+
def mem_itertuples_raw_start(self):
169+
return self.df4.itertuples(index=False, name=None)
170+
171+
def peakmem_itertuples_raw_start(self):
172+
self.df4.itertuples(index=False, name=None)
173+
174+
def peakmem_itertuples_raw_read_first(self):
175+
next(self.df4.itertuples(index=False, name=None))
176+
177+
def peakmem_itertuples_raw(self):
178+
for row in self.df4.itertuples(index=False, name=None):
179+
pass
180+
181+
def mem_itertuples_raw_to_list(self):
182+
return list(self.df4.itertuples(index=False, name=None))
183+
184+
def peakmem_itertuples_raw_to_list(self):
185+
list(self.df4.itertuples(index=False, name=None))
186+
126187
def time_iterrows(self):
127188
for row in self.df.iterrows():
128189
pass

ci/build_docs.sh

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ if [ "$DOC" ]; then
4545
git add --all .
4646
git commit -m "Version" --allow-empty
4747

48-
git remote remove origin
4948
git remote add origin "https://${PANDAS_GH_TOKEN}@github.com/pandas-dev/pandas-docs-travis.git"
5049
git fetch origin
5150
git remote -v

ci/circle/install_circle.sh

-81
This file was deleted.
File renamed without changes.

doc/source/advanced.rst

+8-7
Original file line numberDiff line numberDiff line change
@@ -778,12 +778,12 @@ a ``Categorical`` will return a ``CategoricalIndex``, indexed according to the c
778778
of the **passed** ``Categorical`` dtype. This allows one to arbitrarily index these even with
779779
values **not** in the categories, similarly to how you can reindex **any** pandas index.
780780

781-
.. ipython :: python
781+
.. ipython:: python
782782
783-
df2.reindex(['a','e'])
784-
df2.reindex(['a','e']).index
785-
df2.reindex(pd.Categorical(['a','e'],categories=list('abcde')))
786-
df2.reindex(pd.Categorical(['a','e'],categories=list('abcde'))).index
783+
df2.reindex(['a', 'e'])
784+
df2.reindex(['a', 'e']).index
785+
df2.reindex(pd.Categorical(['a', 'e'], categories=list('abcde')))
786+
df2.reindex(pd.Categorical(['a', 'e'], categories=list('abcde'))).index
787787
788788
.. warning::
789789

@@ -1040,7 +1040,8 @@ than integer locations. Therefore, with an integer axis index *only*
10401040
label-based indexing is possible with the standard tools like ``.loc``. The
10411041
following code will generate exceptions:
10421042

1043-
.. code-block:: python
1043+
.. ipython:: python
1044+
:okexcept:
10441045
10451046
s = pd.Series(range(5))
10461047
s[-1]
@@ -1130,7 +1131,7 @@ index can be somewhat complicated. For example, the following does not work:
11301131

11311132
::
11321133

1133-
s.loc['c':'e'+1]
1134+
s.loc['c':'e' + 1]
11341135

11351136
A very common use case is to limit a time series to start and end at two
11361137
specific dates. To enable this, we made the design to make label-based

0 commit comments

Comments
 (0)