Skip to content

Commit 5ec608c

Browse files
KevsterAmpKevsterAmp
committed
Merge remote-tracking branch 'upstream/main' into tst/dataframe-to_hdf-datetime64
2 parents 306a54a + 602ae10 commit 5ec608c

File tree

156 files changed

+1630
-1374
lines changed

Some content is hidden

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

156 files changed

+1630
-1374
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
fi
3535
python -m pip install --no-build-isolation -ve . -Csetup-args="--werror"
3636
PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
37-
sudo apt-get update && sudo apt-get install -y libegl1 libopengl0
3837
ci/run_tests.sh
3938
test-linux-musl:
4039
docker:

‎.github/workflows/unit-tests.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,12 @@ jobs:
385385
nogil: true
386386

387387
- name: Build Environment
388+
# TODO: Once numpy 2.2.1 is out, don't install nightly version
389+
# Tests segfault with numpy 2.2.0: https://github.com/numpy/numpy/pull/27955
388390
run: |
389391
python --version
390-
python -m pip install --upgrade pip setuptools wheel numpy meson[ninja]==1.2.1 meson-python==0.13.1
391-
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
392+
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
393+
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython numpy
392394
python -m pip install versioneer[toml]
393395
python -m pip install python-dateutil pytz tzdata hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
394396
python -m pip install -ve . --no-build-isolation --no-index --no-deps -Csetup-args="--werror"

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ci:
1919
skip: [pyright, mypy]
2020
repos:
2121
- repo: https://github.com/astral-sh/ruff-pre-commit
22-
rev: v0.7.2
22+
rev: v0.8.1
2323
hooks:
2424
- id: ruff
2525
args: [--exit-non-zero-on-fix]
@@ -47,7 +47,7 @@ repos:
4747
types_or: [python, rst, markdown, cython, c]
4848
additional_dependencies: [tomli]
4949
- repo: https://github.com/MarcoGorelli/cython-lint
50-
rev: v0.16.2
50+
rev: v0.16.6
5151
hooks:
5252
- id: cython-lint
5353
- id: double-quote-cython-strings
@@ -95,7 +95,7 @@ repos:
9595
- id: sphinx-lint
9696
args: ["--enable", "all", "--disable", "line-too-long"]
9797
- repo: https://github.com/pre-commit/mirrors-clang-format
98-
rev: v19.1.3
98+
rev: v19.1.4
9999
hooks:
100100
- id: clang-format
101101
files: ^pandas/_libs/src|^pandas/_libs/include

‎asv_bench/benchmarks/groupby.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,7 @@ def setup(self, dtype, method, application, ncols, engine):
511511
# grouping on multiple columns
512512
# and we lack kernels for a bunch of methods
513513
if (
514-
engine == "numba"
515-
and method in _numba_unsupported_methods
514+
(engine == "numba" and method in _numba_unsupported_methods)
516515
or ncols > 1
517516
or application == "transformation"
518517
or dtype == "datetime"

‎ci/code_checks.sh‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -73,53 +73,28 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7373
-i "pandas.Period.freq GL08" \
7474
-i "pandas.Period.ordinal GL08" \
7575
-i "pandas.RangeIndex.from_range PR01,SA01" \
76-
-i "pandas.Series.dt.unit GL08" \
77-
-i "pandas.Series.pad PR01,SA01" \
7876
-i "pandas.Timedelta.max PR02" \
7977
-i "pandas.Timedelta.min PR02" \
8078
-i "pandas.Timedelta.resolution PR02" \
8179
-i "pandas.Timestamp.max PR02" \
8280
-i "pandas.Timestamp.min PR02" \
8381
-i "pandas.Timestamp.resolution PR02" \
8482
-i "pandas.Timestamp.tzinfo GL08" \
85-
-i "pandas.api.types.is_re_compilable PR07,SA01" \
8683
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
87-
-i "pandas.arrays.IntegerArray SA01" \
88-
-i "pandas.arrays.IntervalArray.length SA01" \
8984
-i "pandas.arrays.NumpyExtensionArray SA01" \
9085
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
91-
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
92-
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
93-
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
94-
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
9586
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
96-
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
97-
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
98-
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
9987
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
100-
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
101-
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
102-
-i "pandas.core.resample.Resampler.indices SA01" \
10388
-i "pandas.core.resample.Resampler.max PR01,RT03,SA01" \
10489
-i "pandas.core.resample.Resampler.mean SA01" \
10590
-i "pandas.core.resample.Resampler.min PR01,RT03,SA01" \
10691
-i "pandas.core.resample.Resampler.prod SA01" \
10792
-i "pandas.core.resample.Resampler.quantile PR01,PR07" \
108-
-i "pandas.core.resample.Resampler.sem SA01" \
10993
-i "pandas.core.resample.Resampler.std SA01" \
11094
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
11195
-i "pandas.core.resample.Resampler.var SA01" \
112-
-i "pandas.errors.IntCastingNaNError SA01" \
113-
-i "pandas.errors.NullFrequencyError SA01" \
114-
-i "pandas.errors.NumbaUtilError SA01" \
115-
-i "pandas.errors.PerformanceWarning SA01" \
116-
-i "pandas.errors.UndefinedVariableError PR01,SA01" \
11796
-i "pandas.errors.ValueLabelTypeMismatch SA01" \
118-
-i "pandas.infer_freq SA01" \
119-
-i "pandas.io.json.build_table_schema PR07,RT03,SA01" \
120-
-i "pandas.io.stata.StataWriter.write_file SA01" \
12197
-i "pandas.plotting.andrews_curves RT03,SA01" \
122-
-i "pandas.plotting.scatter_matrix PR07,SA01" \
12398
-i "pandas.tseries.offsets.BDay PR02,SA01" \
12499
-i "pandas.tseries.offsets.BQuarterBegin.is_on_offset GL08" \
125100
-i "pandas.tseries.offsets.BQuarterBegin.n GL08" \

‎doc/source/conf.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@
242242
"external_links": [],
243243
"footer_start": ["pandas_footer", "sphinx-version"],
244244
"github_url": "https://github.com/pandas-dev/pandas",
245-
"twitter_url": "https://twitter.com/pandas_dev",
246245
"analytics": {
247246
"plausible_analytics_domain": "pandas.pydata.org",
248247
"plausible_analytics_url": "https://views.scientific-python.org/js/script.js",
@@ -258,6 +257,11 @@
258257
# patch version doesn't compare as equal (e.g. 2.2.1 != 2.2.0 but it should be)
259258
"show_version_warning_banner": False,
260259
"icon_links": [
260+
{
261+
"name": "X",
262+
"url": "https://x.com/pandas_dev",
263+
"icon": "fa-brands fa-square-x-twitter",
264+
},
261265
{
262266
"name": "Mastodon",
263267
"url": "https://fosstodon.org/@pandas_dev",

0 commit comments

Comments
 (0)