Skip to content

Commit

Permalink
Merge branch 'main' into bug#60723
Browse files Browse the repository at this point in the history
  • Loading branch information
Anurag-Varma authored Feb 24, 2025
2 parents a6ef45a + d575eea commit 1750d6a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 28 deletions.
6 changes: 3 additions & 3 deletions doc/source/reference/arrays.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ is an :class:`ArrowDtype`.
support as NumPy including first-class nullability support for all data types, immutability and more.

The table below shows the equivalent pyarrow-backed (``pa``), pandas extension, and numpy (``np``) types that are recognized by pandas.
Pyarrow-backed types below need to be passed into :class:`ArrowDtype` to be recognized by pandas e.g. ``pd.ArrowDtype(pa.bool_())``
Pyarrow-backed types below need to be passed into :class:`ArrowDtype` to be recognized by pandas e.g. ``pd.ArrowDtype(pa.bool_())``.

=============================================== ========================== ===================
PyArrow type pandas extension type NumPy type
Expand Down Expand Up @@ -114,7 +114,7 @@ values.

ArrowDtype

For more information, please see the :ref:`PyArrow user guide <pyarrow>`
For more information, please see the :ref:`PyArrow user guide <pyarrow>`.

.. _api.arrays.datetime:

Expand Down Expand Up @@ -495,7 +495,7 @@ a :class:`CategoricalDtype`.
CategoricalDtype.categories
CategoricalDtype.ordered

Categorical data can be stored in a :class:`pandas.Categorical`
Categorical data can be stored in a :class:`pandas.Categorical`:

.. autosummary::
:toctree: api/
Expand Down
12 changes: 6 additions & 6 deletions doc/source/user_guide/text.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Text data types

There are two ways to store text data in pandas:

1. ``object`` -dtype NumPy array.
1. ``object`` dtype NumPy array.
2. :class:`StringDtype` extension type.

We recommend using :class:`StringDtype` to store text data.
Expand All @@ -40,20 +40,20 @@ to significantly increase the performance and lower the memory overhead of
and parts of the API may change without warning.

For backwards-compatibility, ``object`` dtype remains the default type we
infer a list of strings to
infer a list of strings to:

.. ipython:: python
pd.Series(["a", "b", "c"])
To explicitly request ``string`` dtype, specify the ``dtype``
To explicitly request ``string`` dtype, specify the ``dtype``:

.. ipython:: python
pd.Series(["a", "b", "c"], dtype="string")
pd.Series(["a", "b", "c"], dtype=pd.StringDtype())
Or ``astype`` after the ``Series`` or ``DataFrame`` is created
Or ``astype`` after the ``Series`` or ``DataFrame`` is created:

.. ipython:: python
Expand Down Expand Up @@ -88,7 +88,7 @@ Behavior differences
^^^^^^^^^^^^^^^^^^^^

These are places where the behavior of ``StringDtype`` objects differ from
``object`` dtype
``object`` dtype:

l. For ``StringDtype``, :ref:`string accessor methods<api.series.str>`
that return **numeric** output will always return a nullable integer dtype,
Expand All @@ -102,7 +102,7 @@ l. For ``StringDtype``, :ref:`string accessor methods<api.series.str>`
s.str.count("a")
s.dropna().str.count("a")
Both outputs are ``Int64`` dtype. Compare that with object-dtype
Both outputs are ``Int64`` dtype. Compare that with object-dtype:

.. ipython:: python
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/io/test_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -4282,11 +4282,11 @@ def test_xsqlite_execute_fail(sqlite_buildin):
cur.execute(create_sql)

with sql.pandasSQL_builder(sqlite_buildin) as pandas_sql:
pandas_sql.execute('INSERT INTO test VALUES("foo", "bar", 1.234)')
pandas_sql.execute('INSERT INTO test VALUES("foo", "baz", 2.567)')
pandas_sql.execute("INSERT INTO test VALUES('foo', 'bar', 1.234)")
pandas_sql.execute("INSERT INTO test VALUES('foo', 'baz', 2.567)")

with pytest.raises(sql.DatabaseError, match="Execution failed on sql"):
pandas_sql.execute('INSERT INTO test VALUES("foo", "bar", 7)')
pandas_sql.execute("INSERT INTO test VALUES('foo', 'bar', 7)")


def test_xsqlite_execute_closed_connection():
Expand All @@ -4304,7 +4304,7 @@ def test_xsqlite_execute_closed_connection():
cur.execute(create_sql)

with sql.pandasSQL_builder(conn) as pandas_sql:
pandas_sql.execute('INSERT INTO test VALUES("foo", "bar", 1.234)')
pandas_sql.execute("INSERT INTO test VALUES('foo', 'bar', 1.234)")

msg = "Cannot operate on a closed database."
with pytest.raises(sqlite3.ProgrammingError, match=msg):
Expand Down
2 changes: 1 addition & 1 deletion web/pandas/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ and about current sponsors in the [sponsors page]({{ base_url }}about/sponsors.h
infrastructure, travel expenses for our volunteer contributors to attend
the in-person sprints, or to give small grants to develop features.
</p>
<p>Make your donation in the <a href="{{ base_url }}donate.html">donate page</a></p>
<p>Make your donation in the <a href="https://opencollective.com/pandas">donate page</a></p>
</div>
</div>
</div>
Expand Down
14 changes: 0 additions & 14 deletions web/pandas/donate.md

This file was deleted.

0 comments on commit 1750d6a

Please sign in to comment.