Skip to content

Commit d352ad8

Browse files
author
MomIsBestFriend
committed
Merge remote-tracking branch 'upstream/master' into DOC-DocTests-core-groupby
2 parents 9d2930d + 9f8d844 commit d352ad8

Some content is hidden

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

52 files changed

+680
-430
lines changed

ci/code_checks.sh

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -266,57 +266,62 @@ fi
266266
### DOCTESTS ###
267267
if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
268268

269+
# Individual files
270+
271+
MSG='Doctests base.py' ; echo $MSG
272+
pytest -q --doctest-modules pandas/core/base.py
273+
RET=$(($RET + $?)) ; echo $MSG "DONE"
274+
275+
MSG='Doctests construction.py' ; echo $MSG
276+
pytest -q --doctest-modules pandas/core/construction.py
277+
RET=$(($RET + $?)) ; echo $MSG "DONE"
278+
269279
MSG='Doctests frame.py' ; echo $MSG
270280
pytest -q --doctest-modules pandas/core/frame.py
271281
RET=$(($RET + $?)) ; echo $MSG "DONE"
272282

273-
MSG='Doctests series.py' ; echo $MSG
274-
pytest -q --doctest-modules pandas/core/series.py
283+
MSG='Doctests generic.py' ; echo $MSG
284+
pytest -q --doctest-modules pandas/core/generic.py
275285
RET=$(($RET + $?)) ; echo $MSG "DONE"
276286

277287
MSG='Doctests groupby' ; echo $MSG
278288
pytest -q --doctest-modules pandas/core/groupby/
279289
RET=$(($RET + $?)) ; echo $MSG "DONE"
280290

281-
MSG='Doctests tools' ; echo $MSG
282-
pytest -q --doctest-modules pandas/core/tools/
283-
RET=$(($RET + $?)) ; echo $MSG "DONE"
284-
285-
MSG='Doctests reshaping functions' ; echo $MSG
286-
pytest -q --doctest-modules pandas/core/reshape/
291+
MSG='Doctests series.py' ; echo $MSG
292+
pytest -q --doctest-modules pandas/core/series.py
287293
RET=$(($RET + $?)) ; echo $MSG "DONE"
288294

289-
MSG='Doctests interval classes' ; echo $MSG
290-
pytest -q --doctest-modules pandas/core/indexes/interval.py
291-
RET=$(($RET + $?)) ; echo $MSG "DONE"
295+
# Directories
292296

293297
MSG='Doctests arrays'; echo $MSG
294298
pytest -q --doctest-modules pandas/core/arrays/
295299
RET=$(($RET + $?)) ; echo $MSG "DONE"
296300

301+
MSG='Doctests computation' ; echo $MSG
302+
pytest -q --doctest-modules pandas/core/computation/
303+
RET=$(($RET + $?)) ; echo $MSG "DONE"
304+
297305
MSG='Doctests dtypes'; echo $MSG
298306
pytest -q --doctest-modules pandas/core/dtypes/
299307
RET=$(($RET + $?)) ; echo $MSG "DONE"
300308

301-
MSG='Doctests base.py' ; echo $MSG
302-
pytest -q --doctest-modules pandas/core/base.py
309+
MSG='Doctests indexes' ; echo $MSG
310+
pytest -q --doctest-modules pandas/core/indexes/
303311
RET=$(($RET + $?)) ; echo $MSG "DONE"
304312

305-
MSG='Doctests construction.py' ; echo $MSG
306-
pytest -q --doctest-modules pandas/core/construction.py
313+
MSG='Doctests reshaping functions' ; echo $MSG
314+
pytest -q --doctest-modules pandas/core/reshape/
307315
RET=$(($RET + $?)) ; echo $MSG "DONE"
308316

309-
MSG='Doctests generic.py' ; echo $MSG
310-
pytest -q --doctest-modules pandas/core/generic.py
317+
MSG='Doctests tools' ; echo $MSG
318+
pytest -q --doctest-modules pandas/core/tools/
311319
RET=$(($RET + $?)) ; echo $MSG "DONE"
312320

313321
MSG='Doctests tseries' ; echo $MSG
314322
pytest -q --doctest-modules pandas/tseries/
315323
RET=$(($RET + $?)) ; echo $MSG "DONE"
316324

317-
MSG='Doctests computation' ; echo $MSG
318-
pytest -q --doctest-modules pandas/core/computation/
319-
RET=$(($RET + $?)) ; echo $MSG "DONE"
320325
fi
321326

322327
### DOCSTRINGS ###
@@ -327,7 +332,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
327332
RET=$(($RET + $?)) ; echo $MSG "DONE"
328333

329334
MSG='Validate correct capitalization among titles in documentation' ; echo $MSG
330-
$BASE_DIR/scripts/validate_rst_title_capitalization.py $BASE_DIR/doc/source/development/contributing.rst
335+
$BASE_DIR/scripts/validate_rst_title_capitalization.py $BASE_DIR/doc/source/development/contributing.rst $BASE_DIR/doc/source/reference
331336
RET=$(($RET + $?)) ; echo $MSG "DONE"
332337

333338
fi

doc/source/development/code_style.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ consistent code format throughout the project. For details see the
1818
Patterns
1919
========
2020

21-
foo.__class__
22-
-------------
21+
Using foo.__class__
22+
-------------------
2323

2424

2525
pandas uses 'type(foo)' instead 'foo.__class__' as it is making the code more
@@ -47,8 +47,8 @@ String formatting
4747
Concatenated strings
4848
--------------------
4949

50-
f-strings
51-
~~~~~~~~~
50+
Using f-strings
51+
~~~~~~~~~~~~~~~
5252

5353
pandas uses f-strings formatting instead of '%' and '.format()' string formatters.
5454

doc/source/development/contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Below is a brief overview on how to set-up a virtual environment with Powershell
295295
under Windows. For details please refer to the
296296
`official virtualenv user guide <https://virtualenv.pypa.io/en/stable/userguide/#activate-script>`__
297297

298-
Use an ENV_DIR of your choice. We'll use ~\virtualenvs\pandas-dev where
298+
Use an ENV_DIR of your choice. We'll use ~\\virtualenvs\\pandas-dev where
299299
'~' is the folder pointed to by either $env:USERPROFILE (Powershell) or
300300
%USERPROFILE% (cmd.exe) environment variable. Any parent directories
301301
should already exist.

doc/source/development/extending.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ and comments contain guidance for properly implementing the interface.
139139

140140
.. _extending.extension.operator:
141141

142-
:class:`~pandas.api.extensions.ExtensionArray` Operator Support
142+
:class:`~pandas.api.extensions.ExtensionArray` operator support
143143
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
144144

145145
.. versionadded:: 0.24.0

doc/source/development/policies.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Policies
66

77
.. _policies.version:
88

9-
Version Policy
9+
Version policy
1010
~~~~~~~~~~~~~~
1111

1212
.. versionchanged:: 1.0.0
@@ -48,7 +48,7 @@ deprecation removed in the next next major release (2.0.0).
4848
These policies do not apply to features marked as **experimental** in the documentation.
4949
pandas may change the behavior of experimental features at any time.
5050

51-
Python Support
51+
Python support
5252
~~~~~~~~~~~~~~
5353

5454
pandas will only drop support for specific Python versions (e.g. 3.6.x, 3.7.x) in

doc/source/development/roadmap.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ We'd like to fund improvements and maintenance of these tools to
152152

153153
.. _roadmap.evolution:
154154

155-
Roadmap Evolution
155+
Roadmap evolution
156156
-----------------
157157

158158
pandas continues to evolve. The direction is primarily determined by community

doc/source/getting_started/intro_tutorials/09_timeseries.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ objects. In pandas we call these datetime objects similar to
9696

9797
pd.read_csv("../data/air_quality_no2_long.csv", parse_dates=["datetime"])
9898

99-
Why are these :class:`pandas.Timestamp` objects useful. Let’s illustrate the added
99+
Why are these :class:`pandas.Timestamp` objects useful? Let’s illustrate the added
100100
value with some example cases.
101101

102102
What is the start and end date of the time series data set working
@@ -106,7 +106,7 @@ value with some example cases.
106106
107107
air_quality["datetime"].min(), air_quality["datetime"].max()
108108
109-
Using :class:`pandas.Timestamp` for datetimes enable us to calculate with date
109+
Using :class:`pandas.Timestamp` for datetimes enables us to calculate with date
110110
information and make them comparable. Hence, we can use this to get the
111111
length of our time series:
112112

@@ -122,7 +122,7 @@ from the standard Python library and defining a time duration.
122122
<div class="d-flex flex-row gs-torefguide">
123123
<span class="badge badge-info">To user guide</span>
124124

125-
The different time concepts supported by pandas are explained in the user guide section on :ref:`time related concepts <timeseries.overview>`.
125+
The various time concepts supported by pandas are explained in the user guide section on :ref:`time related concepts <timeseries.overview>`.
126126

127127
.. raw:: html
128128

@@ -157,7 +157,7 @@ accessible by the ``dt`` accessor.
157157

158158
An overview of the existing date properties is given in the
159159
:ref:`time and date components overview table <timeseries.components>`. More details about the ``dt`` accessor
160-
to return datetime like properties is explained in a dedicated section on the :ref:`dt accessor <basics.dt_accessors>`.
160+
to return datetime like properties are explained in a dedicated section on the :ref:`dt accessor <basics.dt_accessors>`.
161161

162162
.. raw:: html
163163

@@ -353,7 +353,7 @@ Make a plot of the daily mean :math:`NO_2` value in each of the stations.
353353
<div class="d-flex flex-row gs-torefguide">
354354
<span class="badge badge-info">To user guide</span>
355355

356-
More details on the power of time series ``resampling`` is provided in the user gudie section on :ref:`resampling <timeseries.resampling>`.
356+
More details on the power of time series ``resampling`` is provided in the user guide section on :ref:`resampling <timeseries.resampling>`.
357357

358358
.. raw:: html
359359

@@ -366,7 +366,7 @@ More details on the power of time series ``resampling`` is provided in the user
366366

367367
- Valid date strings can be converted to datetime objects using
368368
``to_datetime`` function or as part of read functions.
369-
- Datetime objects in pandas supports calculations, logical operations
369+
- Datetime objects in pandas support calculations, logical operations
370370
and convenient date-related properties using the ``dt`` accessor.
371371
- A ``DatetimeIndex`` contains these date-related properties and
372372
supports convenient slicing.
@@ -382,7 +382,7 @@ More details on the power of time series ``resampling`` is provided in the user
382382
<div class="d-flex flex-row gs-torefguide">
383383
<span class="badge badge-info">To user guide</span>
384384

385-
A full overview on time series is given in the pages on :ref:`time series and date functionality <timeseries>`.
385+
A full overview on time series is given on the pages on :ref:`time series and date functionality <timeseries>`.
386386

387387
.. raw:: html
388388

doc/source/reference/frame.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Combining / joining / merging
251251
DataFrame.merge
252252
DataFrame.update
253253

254-
Time series-related
254+
Time Series-related
255255
~~~~~~~~~~~~~~~~~~~
256256
.. autosummary::
257257
:toctree: api/

doc/source/reference/indexing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ DatetimeIndex
328328

329329
DatetimeIndex
330330

331-
Time/Date components
331+
Time/date components
332332
~~~~~~~~~~~~~~~~~~~~
333333
.. autosummary::
334334
:toctree: api/

doc/source/reference/series.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Binary operator functions
110110
Series.product
111111
Series.dot
112112

113-
Function application, groupby & window
113+
Function application, GroupBy & window
114114
--------------------------------------
115115
.. autosummary::
116116
:toctree: api/
@@ -249,7 +249,7 @@ Combining / joining / merging
249249
Series.replace
250250
Series.update
251251

252-
Time series-related
252+
Time Series-related
253253
-------------------
254254
.. autosummary::
255255
:toctree: api/

0 commit comments

Comments
 (0)