From 8920d90c2dd9faa0a5084df20b0137ab26ee687f Mon Sep 17 00:00:00 2001 From: Omry Atia Date: Tue, 21 Nov 2023 09:23:25 -0500 Subject: [PATCH 1/2] fix DataFrame.applymap has been deprecated. --- pandarallel/data_types/dataframe.py | 2 +- tests/test_pandarallel.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandarallel/data_types/dataframe.py b/pandarallel/data_types/dataframe.py index 29c7e50..5a08e65 100644 --- a/pandarallel/data_types/dataframe.py +++ b/pandarallel/data_types/dataframe.py @@ -66,7 +66,7 @@ def work( user_defined_function_kwargs: Dict[str, Any], extra: Dict[str, Any], ) -> pd.DataFrame: - return data.applymap(user_defined_function) + return data.map(user_defined_function) @staticmethod def reduce( diff --git a/tests/test_pandarallel.py b/tests/test_pandarallel.py index 0f66fcf..2fa96e7 100644 --- a/tests/test_pandarallel.py +++ b/tests/test_pandarallel.py @@ -212,13 +212,13 @@ def test_dataframe_apply_invalid_axis(pandarallel_init): df.parallel_apply(lambda x: x, axis="invalid") -def test_dataframe_applymap(pandarallel_init, func_dataframe_applymap, df_size): +def test_dataframe_map(pandarallel_init, func_dataframe_applymap, df_size): df = pd.DataFrame( dict(a=np.random.randint(1, 8, df_size), b=np.random.rand(df_size)) ) df.index = [item / 10 for item in df.index] - res = df.applymap(func_dataframe_applymap) + res = df.map(func_dataframe_applymap) res_parallel = df.parallel_applymap(func_dataframe_applymap) assert res.equals(res_parallel) From 861d0d8a932808172986ce5024b2483d5a7a4e24 Mon Sep 17 00:00:00 2001 From: Omry Atia Date: Tue, 21 Nov 2023 09:29:51 -0500 Subject: [PATCH 2/2] fix DataFrame.applymap has been deprecated. --- docs/docs/index.md | 2 +- docs/examples_mac_linux.ipynb | 5 +++-- docs/examples_windows.ipynb | 5 +++-- setup.cfg | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/docs/index.md b/docs/docs/index.md index 42661d5..faa593e 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -29,7 +29,7 @@ get a rough idea of the remaining amount of computation to be done. | Without parallelization | With parallelization | | --------------------------------------------------------- | ------------------------------------------------------------------ | | `df.apply(func)` | `df.parallel_apply(func)` | -| `df.applymap(func)` | `df.parallel_applymap(func)` | +| `df.map(func)` | `df.parallel_applymap(func)` | | `df.groupby(args).apply(func)` | `df.groupby(args).parallel_apply(func)` | | `df.groupby(args1).col_name.rolling(args2).apply(func)` | `df.groupby(args1).col_name.rolling(args2).parallel_apply(func)` | | `df.groupby(args1).col_name.expanding(args2).apply(func)` | `df.groupby(args1).col_name.expanding(args2).parallel_apply(func)` | diff --git a/docs/examples_mac_linux.ipynb b/docs/examples_mac_linux.ipynb index 9a7e304..790131d 100644 --- a/docs/examples_mac_linux.ipynb +++ b/docs/examples_mac_linux.ipynb @@ -101,10 +101,11 @@ ] }, { + "attachments": {}, "cell_type": "markdown", "metadata": {}, "source": [ - "# DataFrame.applymap" + "# DataFrame.map" ] }, { @@ -135,7 +136,7 @@ "outputs": [], "source": [ "%%time\n", - "res = df.applymap(func)" + "res = df.map(func)" ] }, { diff --git a/docs/examples_windows.ipynb b/docs/examples_windows.ipynb index a149db9..f450129 100644 --- a/docs/examples_windows.ipynb +++ b/docs/examples_windows.ipynb @@ -131,10 +131,11 @@ ] }, { + "attachments": {}, "cell_type": "markdown", "metadata": {}, "source": [ - "# DataFrame.applymap" + "# DataFrame.map" ] }, { @@ -166,7 +167,7 @@ "outputs": [], "source": [ "%%time\n", - "res = df.applymap(func)" + "res = df.map(func)" ] }, { diff --git a/setup.cfg b/setup.cfg index 56b6b62..ce5643b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,10 +19,10 @@ classifiers = [options] packages = find: -python_requires = >=3.7 +python_requires = >=3.9 install_requires = dill >= 0.3.1 - pandas >= 1 + pandas >= 2.1.0 psutil [options.packages.find]