Skip to content

Commit be54e24

Browse files
sukriti1sukriti1
authored
Merge branch 'main' into arith-datetime
2 parents dd7ad86 + 139def2 commit be54e24

File tree

109 files changed

+1249
-626
lines changed

Some content is hidden

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

109 files changed

+1249
-626
lines changed

‎.circleci/config.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,13 @@ jobs:
9292
no_output_timeout: 30m # Sometimes the tests won't generate any output, make sure the job doesn't get killed by that
9393
command: |
9494
pip3 install cibuildwheel==2.20.0
95-
cibuildwheel --output-dir wheelhouse
95+
if [[ $CIBW_BUILD == cp313t* ]]; then
96+
# TODO: temporarily run 3.13 free threaded builds without build isolation
97+
# since we need pre-release cython
98+
CIBW_BUILD_FRONTEND="pip; args: --no-build-isolation" cibuildwheel --output-dir wheelhouse
99+
else
100+
cibuildwheel --output-dir wheelhouse
101+
fi
96102
97103
environment:
98104
CIBW_BUILD: << parameters.cibw-build >>
@@ -141,6 +147,10 @@ workflows:
141147
cibw-build: ["cp310-manylinux_aarch64",
142148
"cp311-manylinux_aarch64",
143149
"cp312-manylinux_aarch64",
150+
"cp313-manylinux_aarch64",
151+
"cp313t-manylinux_aarch64",
144152
"cp310-musllinux_aarch64",
145153
"cp311-musllinux_aarch64",
146-
"cp312-musllinux_aarch64",]
154+
"cp312-musllinux_aarch64",
155+
"cp313-musllinux_aarch64",
156+
"cp313t-musllinux_aarch64"]

‎.github/actions/setup-conda/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ runs:
99
- name: Install ${{ inputs.environment-file }}
1010
uses: mamba-org/setup-micromamba@v1
1111
with:
12+
# Pinning to avoid 2.0 failures
13+
micromamba-version: '1.5.10-0'
1214
environment-file: ${{ inputs.environment-file }}
1315
environment-name: test
1416
condarc-file: ci/.condarc

‎.github/workflows/code-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212

1313
env:
1414
ENV_FILE: environment.yml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
tags:
99
- '*'
1010
pull_request:
1111
branches:
1212
- main
13-
- 2.2.x
13+
- 2.3.x
1414

1515
env:
1616
ENV_FILE: environment.yml

‎.github/workflows/package-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
types: [ labeled, opened, synchronize, reopened ]
1313

1414
permissions:

‎.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- 2.2.x
7+
- 2.3.x
88
pull_request:
99
branches:
1010
- main
11-
- 2.2.x
11+
- 2.3.x
1212
paths-ignore:
1313
- "doc/**"
1414
- "web/**"

‎ci/code_checks.sh

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ 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.RangeIndex.step SA01" \
7776
-i "pandas.Series.cat.add_categories PR01,PR02" \
7877
-i "pandas.Series.cat.as_ordered PR01" \
7978
-i "pandas.Series.cat.as_unordered PR01" \
@@ -97,63 +96,41 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
9796
-i "pandas.Series.dt.tz_localize PR01,PR02" \
9897
-i "pandas.Series.dt.unit GL08" \
9998
-i "pandas.Series.pad PR01,SA01" \
100-
-i "pandas.Series.sparse.fill_value SA01" \
10199
-i "pandas.Series.sparse.from_coo PR07,SA01" \
102-
-i "pandas.Series.sparse.npoints SA01" \
103-
-i "pandas.Series.sparse.sp_values SA01" \
104100
-i "pandas.Timedelta.max PR02" \
105101
-i "pandas.Timedelta.min PR02" \
106102
-i "pandas.Timedelta.resolution PR02" \
107-
-i "pandas.Timedelta.to_timedelta64 SA01" \
108-
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
109103
-i "pandas.Timestamp.max PR02" \
110104
-i "pandas.Timestamp.min PR02" \
111105
-i "pandas.Timestamp.nanosecond GL08" \
112106
-i "pandas.Timestamp.resolution PR02" \
113107
-i "pandas.Timestamp.tzinfo GL08" \
114108
-i "pandas.Timestamp.year GL08" \
115-
-i "pandas.api.types.is_dict_like PR07,SA01" \
116-
-i "pandas.api.types.is_file_like PR07,SA01" \
117109
-i "pandas.api.types.is_float PR01,SA01" \
118-
-i "pandas.api.types.is_float_dtype SA01" \
119-
-i "pandas.api.types.is_hashable PR01,RT03,SA01" \
120-
-i "pandas.api.types.is_int64_dtype SA01" \
121110
-i "pandas.api.types.is_integer PR01,SA01" \
122-
-i "pandas.api.types.is_interval_dtype SA01" \
123111
-i "pandas.api.types.is_iterator PR07,SA01" \
124-
-i "pandas.api.types.is_list_like SA01" \
125-
-i "pandas.api.types.is_named_tuple PR07,SA01" \
126-
-i "pandas.api.types.is_object_dtype SA01" \
127-
-i "pandas.api.types.is_re PR07,SA01" \
128112
-i "pandas.api.types.is_re_compilable PR07,SA01" \
129113
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
130114
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
131-
-i "pandas.arrays.BooleanArray SA01" \
132115
-i "pandas.arrays.DatetimeArray SA01" \
133116
-i "pandas.arrays.IntegerArray SA01" \
134117
-i "pandas.arrays.IntervalArray.left SA01" \
135118
-i "pandas.arrays.IntervalArray.length SA01" \
136-
-i "pandas.arrays.IntervalArray.mid SA01" \
137119
-i "pandas.arrays.IntervalArray.right SA01" \
138120
-i "pandas.arrays.NumpyExtensionArray SA01" \
139121
-i "pandas.arrays.SparseArray PR07,SA01" \
140122
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
141123
-i "pandas.core.groupby.DataFrameGroupBy.__iter__ RT03,SA01" \
142-
-i "pandas.core.groupby.DataFrameGroupBy.agg RT03" \
143-
-i "pandas.core.groupby.DataFrameGroupBy.aggregate RT03" \
144124
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
145125
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
146126
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
147-
-i "pandas.core.groupby.DataFrameGroupBy.hist RT03" \
148127
-i "pandas.core.groupby.DataFrameGroupBy.indices SA01" \
149128
-i "pandas.core.groupby.DataFrameGroupBy.nth PR02" \
150129
-i "pandas.core.groupby.DataFrameGroupBy.nunique SA01" \
151130
-i "pandas.core.groupby.DataFrameGroupBy.ohlc SA01" \
152131
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
153132
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
154133
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
155-
-i "pandas.core.groupby.SeriesGroupBy.agg RT03" \
156-
-i "pandas.core.groupby.SeriesGroupBy.aggregate RT03" \
157134
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
158135
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
159136
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
@@ -164,7 +141,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
164141
-i "pandas.core.groupby.SeriesGroupBy.plot PR02" \
165142
-i "pandas.core.groupby.SeriesGroupBy.sem SA01" \
166143
-i "pandas.core.resample.Resampler.__iter__ RT03,SA01" \
167-
-i "pandas.core.resample.Resampler.ffill RT03" \
168144
-i "pandas.core.resample.Resampler.get_group RT03,SA01" \
169145
-i "pandas.core.resample.Resampler.groups SA01" \
170146
-i "pandas.core.resample.Resampler.indices SA01" \
@@ -179,23 +155,19 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
179155
-i "pandas.core.resample.Resampler.sum SA01" \
180156
-i "pandas.core.resample.Resampler.transform PR01,RT03,SA01" \
181157
-i "pandas.core.resample.Resampler.var SA01" \
182-
-i "pandas.date_range RT03" \
183158
-i "pandas.errors.AttributeConflictWarning SA01" \
184159
-i "pandas.errors.CSSWarning SA01" \
185160
-i "pandas.errors.CategoricalConversionWarning SA01" \
186161
-i "pandas.errors.ChainedAssignmentError SA01" \
187-
-i "pandas.errors.ClosedFileError SA01" \
188162
-i "pandas.errors.DataError SA01" \
189163
-i "pandas.errors.DuplicateLabelError SA01" \
190-
-i "pandas.errors.EmptyDataError SA01" \
191164
-i "pandas.errors.IntCastingNaNError SA01" \
192165
-i "pandas.errors.InvalidIndexError SA01" \
193166
-i "pandas.errors.InvalidVersion SA01" \
194167
-i "pandas.errors.NullFrequencyError SA01" \
195168
-i "pandas.errors.NumExprClobberingError SA01" \
196169
-i "pandas.errors.NumbaUtilError SA01" \
197170
-i "pandas.errors.OptionError SA01" \
198-
-i "pandas.errors.OutOfBoundsDatetime SA01" \
199171
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
200172
-i "pandas.errors.PerformanceWarning SA01" \
201173
-i "pandas.errors.PossibleDataLossError SA01" \
@@ -369,7 +341,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
369341
-i "pandas.tseries.offsets.SemiMonthBegin.n GL08" \
370342
-i "pandas.tseries.offsets.SemiMonthBegin.normalize GL08" \
371343
-i "pandas.tseries.offsets.SemiMonthBegin.rule_code GL08" \
372-
-i "pandas.tseries.offsets.SemiMonthEnd SA01" \
373344
-i "pandas.tseries.offsets.SemiMonthEnd.day_of_month GL08" \
374345
-i "pandas.tseries.offsets.SemiMonthEnd.is_on_offset GL08" \
375346
-i "pandas.tseries.offsets.SemiMonthEnd.n GL08" \

‎doc/source/development/contributing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,15 @@ It is important to periodically update your local ``main`` branch with updates f
305305
branch and update your development environment to reflect any changes to the various packages that
306306
are used during development.
307307

308-
If using :ref:`mamba <contributing.mamba>`, run:
308+
If using :ref:`conda <contributing.conda>`, run:
309309

310310
.. code-block:: shell
311311
312312
git checkout main
313313
git fetch upstream
314314
git merge upstream/main
315-
mamba activate pandas-dev
316-
mamba env update -f environment.yml --prune
315+
conda activate pandas-dev
316+
conda env update -f environment.yml --prune
317317
318318
If using :ref:`pip <contributing.pip>` , do:
319319

‎doc/source/development/contributing_codebase.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ in your python environment.
244244

245245
.. warning::
246246

247-
* Please be aware that the above commands will use the current python environment. If your python packages are older/newer than those installed by the pandas CI, the above commands might fail. This is often the case when the ``mypy`` or ``numpy`` versions do not match. Please see :ref:`how to setup the python environment <contributing.mamba>` or select a `recently succeeded workflow <https://github.com/pandas-dev/pandas/actions/workflows/code-checks.yml?query=branch%3Amain+is%3Asuccess>`_, select the "Docstring validation, typing, and other manual pre-commit hooks" job, then click on "Set up Conda" and "Environment info" to see which versions the pandas CI installs.
247+
* Please be aware that the above commands will use the current python environment. If your python packages are older/newer than those installed by the pandas CI, the above commands might fail. This is often the case when the ``mypy`` or ``numpy`` versions do not match. Please see :ref:`how to setup the python environment <contributing.conda>` or select a `recently succeeded workflow <https://github.com/pandas-dev/pandas/actions/workflows/code-checks.yml?query=branch%3Amain+is%3Asuccess>`_, select the "Docstring validation, typing, and other manual pre-commit hooks" job, then click on "Set up Conda" and "Environment info" to see which versions the pandas CI installs.
248248

249249
.. _contributing.ci:
250250

‎doc/source/development/contributing_environment.rst

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ and consult the ``Linux`` instructions below.
4343

4444
**macOS**
4545

46-
To use the :ref:`mamba <contributing.mamba>`-based compilers, you will need to install the
46+
To use the :ref:`conda <contributing.conda>`-based compilers, you will need to install the
4747
Developer Tools using ``xcode-select --install``.
4848

4949
If you prefer to use a different compiler, general information can be found here:
5050
https://devguide.python.org/setup/#macos
5151

5252
**Linux**
5353

54-
For Linux-based :ref:`mamba <contributing.mamba>` installations, you won't have to install any
55-
additional components outside of the mamba environment. The instructions
56-
below are only needed if your setup isn't based on mamba environments.
54+
For Linux-based :ref:`conda <contributing.conda>` installations, you won't have to install any
55+
additional components outside of the conda environment. The instructions
56+
below are only needed if your setup isn't based on conda environments.
5757

5858
Some Linux distributions will come with a pre-installed C compiler. To find out
5959
which compilers (and versions) are installed on your system::
@@ -82,19 +82,18 @@ Before we begin, please:
8282
* Make sure that you have :any:`cloned the repository <contributing.forking>`
8383
* ``cd`` to the pandas source directory you just created with the clone command
8484

85-
.. _contributing.mamba:
85+
.. _contributing.conda:
8686

87-
Option 1: using mamba (recommended)
87+
Option 1: using conda (recommended)
8888
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8989

90-
* Install miniforge to get `mamba <https://mamba.readthedocs.io/en/latest/installation/mamba-installation.html>`_
91-
* Make sure your mamba is up to date (``mamba update mamba``)
92-
* Create and activate the ``pandas-dev`` mamba environment using the following commands:
90+
* Install miniforge to get `conda <https://github.com/conda-forge/miniforge?tab=readme-ov-file#download>`_
91+
* Create and activate the ``pandas-dev`` conda environment using the following commands:
9392

94-
.. code-block:: none
93+
.. code-block:: bash
9594
96-
mamba env create --file environment.yml
97-
mamba activate pandas-dev
95+
conda env create --file environment.yml
96+
conda activate pandas-dev
9897
9998
.. _contributing.pip:
10099

0 commit comments

Comments
 (0)