Skip to content

Commit bebcc6e

Browse files
rhshadrachrhshadrach
authored
Merge branch 'main' into ngroup-axis-1
2 parents b356c6a + 56c1b20 commit bebcc6e

File tree

182 files changed

+3983
-2274
lines changed

Some content is hidden

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

182 files changed

+3983
-2274
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ body:
1717
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
1818
required: true
1919
- label: >
20-
I have confirmed this bug exists on the [main branch]
21-
(https://pandas.pydata.org/docs/dev/getting_started/install.html#installing-the-development-version-of-pandas)
20+
I have confirmed this bug exists on the
21+
[main branch](https://pandas.pydata.org/docs/dev/getting_started/install.html#installing-the-development-version-of-pandas)
2222
of pandas.
2323
- type: textarea
2424
id: example

‎.github/workflows/docbuild-and-upload.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ jobs:
4646
- name: Build Pandas
4747
uses: ./.github/actions/build_pandas
4848

49-
- name: Set up maintainers cache
50-
uses: actions/cache@v3
51-
with:
52-
path: maintainers.json
53-
key: maintainers
54-
5549
- name: Build website
5650
run: python web/pandas_web.py web/pandas --target-path=web/build
5751

‎.github/workflows/macos-windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
matrix:
3333
os: [macos-latest, windows-latest]
34-
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
34+
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
3535
fail-fast: false
3636
runs-on: ${{ matrix.os }}
3737
name: ${{ format('{0} {1}', matrix.os, matrix.env_file) }}

‎.github/workflows/python-dev.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ name: Python Dev
2323
on:
2424
push:
2525
branches:
26-
- main
27-
- 1.5.x
26+
# - main
27+
# - 1.5.x
28+
- None
2829
pull_request:
2930
branches:
30-
- main
31-
- 1.5.x
31+
# - main
32+
# - 1.5.x
33+
- None
3234
paths-ignore:
3335
- "doc/**"
3436

‎.github/workflows/ubuntu.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
timeout-minutes: 180
2828
strategy:
2929
matrix:
30-
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
30+
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml]
3131
pattern: ["not single_cpu", "single_cpu"]
3232
pyarrow_version: ["7", "8", "9", "10"]
3333
include:
@@ -77,7 +77,7 @@ jobs:
7777
- name: "Numpy Dev"
7878
env_file: actions-310-numpydev.yaml
7979
pattern: "not slow and not network and not single_cpu"
80-
test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
80+
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
8181
error_on_warnings: "0"
8282
exclude:
8383
- env_file: actions-38.yaml
@@ -92,6 +92,12 @@ jobs:
9292
pyarrow_version: "8"
9393
- env_file: actions-39.yaml
9494
pyarrow_version: "9"
95+
- env_file: actions-311.yaml
96+
pyarrow_version: "7"
97+
- env_file: actions-311.yaml
98+
pyarrow_version: "8"
99+
- env_file: actions-311.yaml
100+
pyarrow_version: "9"
95101
fail-fast: false
96102
name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}
97103
env:

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,3 @@ repos:
443443
types: [python]
444444
files: ^pandas/tests
445445
language: python
446-
exclude: |
447-
(?x)
448-
^pandas/tests/generic/test_generic.py # GH50380

‎asv_bench/benchmarks/array.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def time_setitem(self, multiple_chunks):
9393
self.array[i] = "foo"
9494

9595
def time_setitem_list(self, multiple_chunks):
96-
indexer = list(range(0, 50)) + list(range(-50, 0))
96+
indexer = list(range(0, 50)) + list(range(-1000, 0, 50))
9797
self.array[indexer] = ["foo"] * len(indexer)
9898

9999
def time_setitem_slice(self, multiple_chunks):

‎asv_bench/benchmarks/io/hdf.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,17 @@ def setup(self, format):
128128
self.df["object"] = tm.makeStringIndex(N)
129129
self.df.to_hdf(self.fname, "df", format=format)
130130

131+
# Numeric df
132+
self.df1 = self.df.copy()
133+
self.df1 = self.df1.reset_index()
134+
self.df1.to_hdf(self.fname, "df1", format=format)
135+
131136
def time_read_hdf(self, format):
132137
read_hdf(self.fname, "df")
133138

139+
def peakmem_read_hdf(self, format):
140+
read_hdf(self.fname, "df")
141+
134142
def time_write_hdf(self, format):
135143
self.df.to_hdf(self.fname, "df", format=format)
136144

‎asv_bench/benchmarks/io/json.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@ def time_float_longint_str_lines(self):
294294
class ToJSONMem:
295295
def setup_cache(self):
296296
df = DataFrame([[1]])
297-
frames = {"int": df, "float": df.astype(float)}
297+
df2 = DataFrame(range(8), date_range("1/1/2000", periods=8, freq="T"))
298+
frames = {"int": df, "float": df.astype(float), "datetime": df2}
298299

299300
return frames
300301

@@ -308,5 +309,10 @@ def peakmem_float(self, frames):
308309
for _ in range(100_000):
309310
df.to_json()
310311

312+
def peakmem_time(self, frames):
313+
df = frames["datetime"]
314+
for _ in range(10_000):
315+
df.to_json(orient="table")
316+
311317

312318
from ..pandas_vb_common import setup # noqa: F401 isort:skip

‎ci/code_checks.sh‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -79,33 +79,8 @@ fi
7979
### DOCSTRINGS ###
8080
if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
8181

82-
MSG='Validate docstrings (EX04, GL01, GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, PR03, PR04, PR05, PR06, PR08, PR09, PR10, RT01, RT04, RT05, SA02, SA03, SA04, SS01, SS02, SS03, SS04, SS05, SS06)' ; echo $MSG
83-
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX04,GL01,GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,PR03,PR04,PR05,PR06,PR08,PR09,PR10,RT01,RT04,RT05,SA02,SA03,SA04,SS01,SS02,SS03,SS04,SS05,SS06
84-
RET=$(($RET + $?)) ; echo $MSG "DONE"
85-
86-
MSG='Partially validate docstrings (RT02)' ; echo $MSG
87-
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=RT02 --ignore_functions \
88-
pandas.Series.align \
89-
pandas.Series.dt.total_seconds \
90-
pandas.Series.cat.rename_categories \
91-
pandas.Series.cat.reorder_categories \
92-
pandas.Series.cat.add_categories \
93-
pandas.Series.cat.remove_categories \
94-
pandas.Series.cat.remove_unused_categories \
95-
pandas.Index.all \
96-
pandas.Index.any \
97-
pandas.MultiIndex.drop \
98-
pandas.DatetimeIndex.to_pydatetime \
99-
pandas.TimedeltaIndex.to_pytimedelta \
100-
pandas.core.groupby.SeriesGroupBy.apply \
101-
pandas.core.groupby.DataFrameGroupBy.apply \
102-
pandas.io.formats.style.Styler.export \
103-
pandas.api.extensions.ExtensionArray.astype \
104-
pandas.api.extensions.ExtensionArray.dropna \
105-
pandas.api.extensions.ExtensionArray.isna \
106-
pandas.api.extensions.ExtensionArray.repeat \
107-
pandas.api.extensions.ExtensionArray.unique \
108-
pandas.DataFrame.align
82+
MSG='Validate docstrings (EX04, GL01, GL02, GL03, GL04, GL05, GL06, GL07, GL09, GL10, PR03, PR04, PR05, PR06, PR08, PR09, PR10, RT01, RT02, RT04, RT05, SA02, SA03, SA04, SS01, SS02, SS03, SS04, SS05, SS06)' ; echo $MSG
83+
$BASE_DIR/scripts/validate_docstrings.py --format=actions --errors=EX04,GL01,GL02,GL03,GL04,GL05,GL06,GL07,GL09,GL10,PR03,PR04,PR05,PR06,PR08,PR09,PR10,RT01,RT02,RT04,RT05,SA02,SA03,SA04,SS01,SS02,SS03,SS04,SS05,SS06
10984
RET=$(($RET + $?)) ; echo $MSG "DONE"
11085

11186
fi

0 commit comments

Comments
 (0)