From 352102d7136cea6bf8b9e7e98cefb6a2df724b48 Mon Sep 17 00:00:00 2001 From: soumyas567 <14910227+soumyas567@users.noreply.github.com> Date: Fri, 19 Nov 2021 11:56:24 +0000 Subject: [PATCH 1/7] validate PR09 errors --- ci/code_checks.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/code_checks.sh b/ci/code_checks.sh index ea9595fd88630..7615e21806109 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -93,8 +93,8 @@ fi ### DOCSTRINGS ### if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then - MSG='Validate docstrings (GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS01, SS02, SS04, SS05, PR03, PR04, PR05, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG - $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS02,SS04,SS05,PR03,PR04,PR05,PR10,EX04,RT01,RT04,RT05,SA02,SA03 + MSG='Validate docstrings (GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS01, SS02, SS04, SS05, PR03, PR04, PR05, PR09, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG + $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS02,SS04,SS05,PR03,PR04,PR05,PR09,PR10,EX04,RT01,RT04,RT05,SA02,SA03 RET=$(($RET + $?)) ; echo $MSG "DONE" fi From 0d038f5bacc78b1ebcc5e473b25ca3a540b152e0 Mon Sep 17 00:00:00 2001 From: soumyas567 <14910227+soumyas567@users.noreply.github.com> Date: Fri, 19 Nov 2021 14:34:05 +0000 Subject: [PATCH 2/7] fullstops Added --- pandas/core/frame.py | 2 +- pandas/core/series.py | 2 +- pandas/io/formats/style.py | 8 ++++---- pandas/io/formats/style_render.py | 8 ++++---- pandas/io/parquet.py | 2 +- pandas/io/sql.py | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 0960ab4a81149..66d3800301f92 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -7748,7 +7748,7 @@ def update( Wild 185.0 We can also choose to include NA in group keys or not by setting -`dropna` parameter, the default setting is `True`: +`dropna` parameter, the default setting is `True`. >>> l = [[1, 2, 3], [1, None, 4], [2, 1, 3], [1, 2, 2]] >>> df = pd.DataFrame(l, columns=["a", "b", "c"]) diff --git a/pandas/core/series.py b/pandas/core/series.py index e0a63b8e35105..f0f5bd7c3e2b2 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -1838,7 +1838,7 @@ def _set_name(self, name, inplace=False) -> Series: Name: Max Speed, dtype: float64 We can also choose to include `NA` in group keys or not by defining -`dropna` parameter, the default setting is `True`: +`dropna` parameter, the default setting is `True`. >>> ser = pd.Series([1, 2, 3, 3], index=["a", 'a', 'b', np.nan]) >>> ser.groupby(level=0).sum() diff --git a/pandas/io/formats/style.py b/pandas/io/formats/style.py index b16e6e6366330..f53bd8d90c0c0 100644 --- a/pandas/io/formats/style.py +++ b/pandas/io/formats/style.py @@ -136,7 +136,7 @@ class Styler(StylerRenderer): in cell display string with HTML-safe sequences. Use 'latex' to replace the characters ``&``, ``%``, ``$``, ``#``, ``_``, ``{``, ``}``, ``~``, ``^``, and ``\`` in the cell display string with - LaTeX-safe sequences. If not given uses ``pandas.options.styler.format.escape`` + LaTeX-safe sequences. If not given uses ``pandas.options.styler.format.escape``. .. versionadded:: 1.3.0 formatter : str, callable, dict, optional @@ -504,7 +504,7 @@ def to_latex( position : str, optional The LaTeX positional argument (e.g. 'h!') for tables, placed in location: - \\begin{table}[] + \\begin{table}[]. position_float : {"centering", "raggedleft", "raggedright"}, optional The LaTeX float command placed in location: @@ -2831,7 +2831,7 @@ def bar( When None (default): the maximum value of the data will be used. props : str, optional The base CSS of the cell that is extended to add the bar chart. Defaults to - `"width: 10em;"` + `"width: 10em;"`. .. versionadded:: 1.4.0 @@ -3156,7 +3156,7 @@ def highlight_quantile( or single key, to `DataFrame.loc[:, ]` where the columns are prioritised, to limit ``data`` to *before* applying the function. color : str, default 'yellow' - Background color to use for highlighting + Background color to use for highlighting. axis : {0 or 'index', 1 or 'columns', None}, default 0 Axis along which to determine and highlight quantiles. If ``None`` quantiles are measured over the entire DataFrame. See examples. diff --git a/pandas/io/formats/style_render.py b/pandas/io/formats/style_render.py index ae4e05160e70a..a94d9ee5416c4 100644 --- a/pandas/io/formats/style_render.py +++ b/pandas/io/formats/style_render.py @@ -817,12 +817,12 @@ def format( .. versionadded:: 1.3.0 decimal : str, default "." - Character used as decimal separator for floats, complex and integers + Character used as decimal separator for floats, complex and integers. .. versionadded:: 1.3.0 thousands : str, optional, default None - Character used as thousands separator for floats, complex and integers + Character used as thousands separator for floats, complex and integers. .. versionadded:: 1.3.0 @@ -1011,9 +1011,9 @@ def format_index( Floating point precision to use for display purposes, if not determined by the specified ``formatter``. decimal : str, default "." - Character used as decimal separator for floats, complex and integers + Character used as decimal separator for floats, complex and integers. thousands : str, optional, default None - Character used as thousands separator for floats, complex and integers + Character used as thousands separator for floats, complex and integers. escape : str, optional Use 'html' to replace the characters ``&``, ``<``, ``>``, ``'``, and ``"`` in cell display string with HTML-safe sequences. diff --git a/pandas/io/parquet.py b/pandas/io/parquet.py index c4b9e36472092..db35b82ac1d50 100644 --- a/pandas/io/parquet.py +++ b/pandas/io/parquet.py @@ -457,7 +457,7 @@ def read_parquet( A file URL can also be a path to a directory that contains multiple partitioned parquet files. Both pyarrow and fastparquet support paths to directories as well as file URLs. A directory path could be: - ``file://localhost/path/to/tables`` or ``s3://bucket/partition_dir`` + ``file://localhost/path/to/tables`` or ``s3://bucket/partition_dir``. engine : {{'auto', 'pyarrow', 'fastparquet'}}, default 'auto' Parquet library to use. If 'auto', then the option ``io.parquet.engine`` is used. The default ``io.parquet.engine`` diff --git a/pandas/io/sql.py b/pandas/io/sql.py index 4be54ceaa2bcf..26869a660f4b4 100644 --- a/pandas/io/sql.py +++ b/pandas/io/sql.py @@ -376,7 +376,7 @@ def read_sql_query( rows to include in each chunk. dtype : Type name or dict of columns Data type for data or columns. E.g. np.float64 or - {‘a’: np.float64, ‘b’: np.int32, ‘c’: ‘Int64’} + {‘a’: np.float64, ‘b’: np.int32, ‘c’: ‘Int64’}. .. versionadded:: 1.3.0 From b51467b57ceb217f00ed2a1d76927150ae99b7c4 Mon Sep 17 00:00:00 2001 From: soumyas567 <14910227+soumyas567@users.noreply.github.com> Date: Fri, 19 Nov 2021 17:43:43 +0000 Subject: [PATCH 3/7] timestamps.pyx updated with a fullstop --- pandas/_libs/tslibs/timestamps.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/_libs/tslibs/timestamps.pyx b/pandas/_libs/tslibs/timestamps.pyx index 9ea347594229f..00149dec0790f 100644 --- a/pandas/_libs/tslibs/timestamps.pyx +++ b/pandas/_libs/tslibs/timestamps.pyx @@ -1019,7 +1019,7 @@ class Timestamp(_Timestamp): Due to daylight saving time, one wall clock time can occur twice when shifting from summer to winter time; fold describes whether the datetime-like corresponds to the first (0) or the second time (1) - the wall clock hits the ambiguous time + the wall clock hits the ambiguous time. .. versionadded:: 1.1.0 From c18d8a0f9bb267c08cbc91cf9b8b0bd32dae1be8 Mon Sep 17 00:00:00 2001 From: soumyas567 <14910227+soumyas567@users.noreply.github.com> Date: Fri, 19 Nov 2021 19:58:06 +0000 Subject: [PATCH 4/7] full stop added to rolling.py and shared_docs.py --- pandas/core/shared_docs.py | 2 +- pandas/core/window/rolling.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/shared_docs.py b/pandas/core/shared_docs.py index bc4f4d657b859..6bb7c1fa4418d 100644 --- a/pandas/core/shared_docs.py +++ b/pandas/core/shared_docs.py @@ -126,7 +126,7 @@ dropna : bool, default True If True, and if group keys contain NA values, NA values together with row/column will be dropped. - If False, NA values will also be treated as the key in groups + If False, NA values will also be treated as the key in groups. .. versionadded:: 1.1.0 diff --git a/pandas/core/window/rolling.py b/pandas/core/window/rolling.py index f7799912937b7..aac6392ca31d4 100644 --- a/pandas/core/window/rolling.py +++ b/pandas/core/window/rolling.py @@ -902,7 +902,7 @@ class Window(BaseWindow): If ``'neither'``, the first and last points in the window are excluded from calculations. - Default ``None`` (``'right'``) + Default ``None`` (``'right'``). .. versionchanged:: 1.2.0 From bd6864caf5b12641140b1faac77d971a05979b68 Mon Sep 17 00:00:00 2001 From: soumyas567 <14910227+soumyas567@users.noreply.github.com> Date: Sun, 21 Nov 2021 09:32:41 +0000 Subject: [PATCH 5/7] backticks added to Latex position argument --- pandas/io/formats/style.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/io/formats/style.py b/pandas/io/formats/style.py index f53bd8d90c0c0..1de746435ef8d 100644 --- a/pandas/io/formats/style.py +++ b/pandas/io/formats/style.py @@ -504,7 +504,7 @@ def to_latex( position : str, optional The LaTeX positional argument (e.g. 'h!') for tables, placed in location: - \\begin{table}[]. + ``\\begin{table}[]``. position_float : {"centering", "raggedleft", "raggedright"}, optional The LaTeX float command placed in location: From c6001cdaed9a074873905337d013220ab7a70650 Mon Sep 17 00:00:00 2001 From: Soumya <14910227+soumyas567@users.noreply.github.com> Date: Tue, 23 Nov 2021 11:43:28 +0000 Subject: [PATCH 6/7] merge_conflict_resolved_PRO9 --- ci/code_checks.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ci/code_checks.sh b/ci/code_checks.sh index 5a15af68d6f55..2f673cde22650 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -93,13 +93,9 @@ fi ### DOCSTRINGS ### if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then -<<<<<<< HEAD - MSG='Validate docstrings (GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS01, SS02, SS04, SS05, PR03, PR04, PR05, PR09, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG - $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS02,SS04,SS05,PR03,PR04,PR05,PR09,PR10,EX04,RT01,RT04,RT05,SA02,SA03 -======= - MSG='Validate docstrings (GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS01, SS02, SS03, SS04, SS05, PR03, PR04, PR05, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG - $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS02,SS03,SS04,SS05,PR03,PR04,PR05,PR10,EX04,RT01,RT04,RT05,SA02,SA03 ->>>>>>> upstream/master + + MSG='Validate docstrings (GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS01, SS02, SS03, SS04, SS05, PR03, PR04, PR05, PRO9, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG + $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS02,SS03,SS04,SS05,PR03,PR04,PR05,PR09,PR10,EX04,RT01,RT04,RT05,SA02,SA03 RET=$(($RET + $?)) ; echo $MSG "DONE" fi From 841c0ee9643c16c774dec3406932ebbc711e8b3d Mon Sep 17 00:00:00 2001 From: Marco Edward Gorelli Date: Tue, 23 Nov 2021 11:44:33 +0000 Subject: [PATCH 7/7] remove extra blank line --- ci/code_checks.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/code_checks.sh b/ci/code_checks.sh index 2f673cde22650..744f934142a24 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -93,7 +93,6 @@ fi ### DOCSTRINGS ### if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then - MSG='Validate docstrings (GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, SS01, SS02, SS03, SS04, SS05, PR03, PR04, PR05, PRO9, PR10, EX04, RT01, RT04, RT05, SA02, SA03)' ; echo $MSG $BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,SS02,SS03,SS04,SS05,PR03,PR04,PR05,PR09,PR10,EX04,RT01,RT04,RT05,SA02,SA03 RET=$(($RET + $?)) ; echo $MSG "DONE"