Skip to content

Commit b9f41fb

Browse files
committed
Merge remote-tracking branch 'upstream/main' into better-msg-delta-series_timestamp
2 parents 11dd714 + ba7e83d commit b9f41fb

File tree

33 files changed

+639
-255
lines changed

33 files changed

+639
-255
lines changed

.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 & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,25 +97,18 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
9797
-i "pandas.Series.dt.unit GL08" \
9898
-i "pandas.Series.pad PR01,SA01" \
9999
-i "pandas.Series.sparse.from_coo PR07,SA01" \
100-
-i "pandas.Series.sparse.npoints SA01" \
101100
-i "pandas.Timedelta.max PR02" \
102101
-i "pandas.Timedelta.min PR02" \
103102
-i "pandas.Timedelta.resolution PR02" \
104-
-i "pandas.TimedeltaIndex.to_pytimedelta RT03,SA01" \
105103
-i "pandas.Timestamp.max PR02" \
106104
-i "pandas.Timestamp.min PR02" \
107105
-i "pandas.Timestamp.nanosecond GL08" \
108106
-i "pandas.Timestamp.resolution PR02" \
109107
-i "pandas.Timestamp.tzinfo GL08" \
110108
-i "pandas.Timestamp.year GL08" \
111-
-i "pandas.api.types.is_dict_like PR07,SA01" \
112-
-i "pandas.api.types.is_file_like PR07,SA01" \
113109
-i "pandas.api.types.is_float PR01,SA01" \
114-
-i "pandas.api.types.is_hashable PR01,RT03,SA01" \
115110
-i "pandas.api.types.is_integer PR01,SA01" \
116111
-i "pandas.api.types.is_iterator PR07,SA01" \
117-
-i "pandas.api.types.is_named_tuple PR07,SA01" \
118-
-i "pandas.api.types.is_re PR07,SA01" \
119112
-i "pandas.api.types.is_re_compilable PR07,SA01" \
120113
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
121114
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
@@ -128,8 +121,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
128121
-i "pandas.arrays.SparseArray PR07,SA01" \
129122
-i "pandas.arrays.TimedeltaArray PR07,SA01" \
130123
-i "pandas.core.groupby.DataFrameGroupBy.__iter__ RT03,SA01" \
131-
-i "pandas.core.groupby.DataFrameGroupBy.agg RT03" \
132-
-i "pandas.core.groupby.DataFrameGroupBy.aggregate RT03" \
133124
-i "pandas.core.groupby.DataFrameGroupBy.boxplot PR07,RT03,SA01" \
134125
-i "pandas.core.groupby.DataFrameGroupBy.get_group RT03,SA01" \
135126
-i "pandas.core.groupby.DataFrameGroupBy.groups SA01" \
@@ -140,8 +131,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
140131
-i "pandas.core.groupby.DataFrameGroupBy.plot PR02" \
141132
-i "pandas.core.groupby.DataFrameGroupBy.sem SA01" \
142133
-i "pandas.core.groupby.SeriesGroupBy.__iter__ RT03,SA01" \
143-
-i "pandas.core.groupby.SeriesGroupBy.agg RT03" \
144-
-i "pandas.core.groupby.SeriesGroupBy.aggregate RT03" \
145134
-i "pandas.core.groupby.SeriesGroupBy.get_group RT03,SA01" \
146135
-i "pandas.core.groupby.SeriesGroupBy.groups SA01" \
147136
-i "pandas.core.groupby.SeriesGroupBy.indices SA01" \
@@ -170,7 +159,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
170159
-i "pandas.errors.CSSWarning SA01" \
171160
-i "pandas.errors.CategoricalConversionWarning SA01" \
172161
-i "pandas.errors.ChainedAssignmentError SA01" \
173-
-i "pandas.errors.ClosedFileError SA01" \
174162
-i "pandas.errors.DataError SA01" \
175163
-i "pandas.errors.DuplicateLabelError SA01" \
176164
-i "pandas.errors.IntCastingNaNError SA01" \
@@ -180,7 +168,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
180168
-i "pandas.errors.NumExprClobberingError SA01" \
181169
-i "pandas.errors.NumbaUtilError SA01" \
182170
-i "pandas.errors.OptionError SA01" \
183-
-i "pandas.errors.OutOfBoundsDatetime SA01" \
184171
-i "pandas.errors.OutOfBoundsTimedelta SA01" \
185172
-i "pandas.errors.PerformanceWarning SA01" \
186173
-i "pandas.errors.PossibleDataLossError SA01" \

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

doc/source/getting_started/intro_tutorials/08_combine_dataframes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ Add the parameters' full description and name, provided by the parameters metada
271271
272272
Compared to the previous example, there is no common column name.
273273
However, the ``parameter`` column in the ``air_quality`` table and the
274-
``id`` column in the ``air_quality_parameters_name`` both provide the
274+
``id`` column in the ``air_quality_parameters`` table both provide the
275275
measured variable in a common format. The ``left_on`` and ``right_on``
276276
arguments are used here (instead of just ``on``) to make the link
277277
between the two tables.

0 commit comments

Comments
 (0)