Skip to content

Commit 1937a79

Browse files
tuhinsharma121tuhinsharma121
authored
Merge branch 'main' into pandas.json_normalize
2 parents a5d7b34 + 6d4ba80 commit 1937a79

File tree

10 files changed

+16
-11
lines changed

10 files changed

+16
-11
lines changed

‎ci/code_checks.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
104104
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
105105
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
106106
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
107-
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
108107
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
109108
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
110109
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
@@ -114,7 +113,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
114113
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_decreasing SA01" \
115114
-i "pandas.core.groupby.SeriesGroupBy.is_monotonic_increasing SA01" \
116115
-i "pandas.core.groupby.SeriesGroupBy.nth PR02" \
117-
-i "pandas.core.groupby.SeriesGroupBy.ohlc SA01" \
118116
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
119117
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
120118
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
@@ -124,7 +122,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
124122
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
125123
-i "pandas.core.resample.Resampler.mean SA01" \
126124
-i "pandas.core.resample.Resampler.min PR01,RT03,SA01" \
127-
-i "pandas.core.resample.Resampler.ohlc SA01" \
128125
-i "pandas.core.resample.Resampler.prod SA01" \
129126
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
130127
-i "pandas.core.resample.Resampler.sem SA01" \

‎ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <=2024.9.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

‎ci/deps/actions-311-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ dependencies:
5353
- scipy>=1.10.0
5454
- sqlalchemy>=2.0.0
5555
- tabulate>=0.9.0
56-
- xarray>=2022.12.0
56+
- xarray>=2022.12.0, <=2024.9.0
5757
- xlrd>=2.0.1
5858
- xlsxwriter>=3.0.5
5959
- zstandard>=0.19.0

‎ci/deps/actions-311.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <=2024.9.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

‎ci/deps/actions-312.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <=2024.9.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

‎ci/deps/circle-311-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies:
5252
- scipy>=1.10.0
5353
- sqlalchemy>=2.0.0
5454
- tabulate>=0.9.0
55-
- xarray>=2022.12.0
55+
- xarray>=2022.12.0, <2024.10.0
5656
- xlrd>=2.0.1
5757
- xlsxwriter>=3.0.5
5858
- zstandard>=0.19.0

‎environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies:
5555
- scipy>=1.10.0
5656
- sqlalchemy>=2.0.0
5757
- tabulate>=0.9.0
58-
- xarray>=2022.12.0
58+
- xarray>=2022.12.0, <=2024.9.0
5959
- xlrd>=2.0.1
6060
- xlsxwriter>=3.0.5
6161
- zstandard>=0.19.0

‎pandas/core/groupby/groupby.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3224,6 +3224,12 @@ def ohlc(self) -> DataFrame:
32243224
DataFrame
32253225
Open, high, low and close values within each group.
32263226
3227+
See Also
3228+
--------
3229+
DataFrame.agg : Aggregate using one or more operations over the specified axis.
3230+
DataFrame.resample : Resample time-series data.
3231+
DataFrame.groupby : Group DataFrame using a mapper or by a Series of columns.
3232+
32273233
Examples
32283234
--------
32293235

‎pandas/tests/io/test_spss.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,6 @@ def test_spss_metadata(datapath):
177177
"modification_time": datetime.datetime(2015, 2, 6, 14, 33, 36),
178178
}
179179
)
180-
assert df.attrs == metadata
180+
if Version(pyreadstat.__version__) >= Version("1.2.8"):
181+
metadata["mr_sets"] = {}
182+
tm.assert_dict_equal(df.attrs, metadata)

‎requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ s3fs>=2022.11.0
4444
scipy>=1.10.0
4545
SQLAlchemy>=2.0.0
4646
tabulate>=0.9.0
47-
xarray>=2022.12.0
47+
xarray>=2022.12.0, <=2024.9.0
4848
xlrd>=2.0.1
4949
xlsxwriter>=3.0.5
5050
zstandard>=0.19.0

0 commit comments

Comments
 (0)