Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix_pytest_command
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromedockes committed Sep 26, 2023
2 parents 7edbd68 + a8af7d5 commit 8e68959
Show file tree
Hide file tree
Showing 23 changed files with 1,153 additions and 405 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
- dependencies-version: "dev"
- dependencies-version: "dev, pyarrow"
python-version: "3.11"
- dependencies-version: "dev, polars"
python-version: "3.11"
- dependencies-version: "dev, min-py310"
python-version: "3.10"
dependencies-version-type: "minimal"
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ development and backward compatibility is not ensured.
Major changes
-------------

* :func:`dataframe.pd_join`, :func:`dataframe.pd_aggregate`,
:func:`dataframe.pl_join` and :func:`dataframe.pl_aggregate`
are now available in the dataframe submodule.
:pr:`733` by :user:`Vincent Maladiere <Vincent-Maladiere>`

* :class:`FeatureAugmenter` is renamed to :class:`Joiner`.
:pr:`674` by :user:`Jovan Stojanovic <jovan-stojanovic>`

Expand Down
2 changes: 1 addition & 1 deletion build_tools/github/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fi

pip install --progress-bar off --only-binary :all: --no-binary liac-arff --upgrade ".[$DEPS_VERSION]"

if [[ "$DEPS_VERSION" != *"pyarrow"* ]]; then
if [[ "$DEPS_VERSION" != *"pyarrow"* && "$DEPS_VERSION" != *"polars"* ]]; then
# Since pyarrow is a dependency of pandas, we need to uninstall it explicitly
pip uninstall -y pyarrow
fi
40 changes: 40 additions & 0 deletions doc/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,46 @@ This page lists all available functions and classes of `skrub`.

deduplicate

.. raw:: html

<h2>Dataframes operations</h2>

.. autosummary::
:toctree: generated/
:template: function.rst
:nosignatures:
:caption: DataFrames operations

dataframe.get_df_namespace

.. raw:: html

<h3>Pandas</h3>

.. autosummary::
:toctree: generated/
:template: function.rst
:nosignatures:
:caption: Pandas operations

dataframe.is_pandas
dataframe.pd_aggregate
dataframe.pd_join

.. raw:: html

<h3>Polars</h3>

.. autosummary::
:toctree: generated/
:template: function.rst
:nosignatures:
:caption: Polars operations

dataframe.is_polars
dataframe.pl_aggregate
dataframe.pl_join

.. raw:: html

<h2>Data download and generation</h2>
Expand Down
Loading

0 comments on commit 8e68959

Please sign in to comment.