From 08fcff09a459953a396799285b7d01e7c7ac3152 Mon Sep 17 00:00:00 2001 From: Louis Dorard Date: Mon, 7 Oct 2024 11:45:15 +0200 Subject: [PATCH 1/5] Require pandas 1.3 (instead of 1.5) --- dss-plugin-visual-edit/code-env/python/spec/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dss-plugin-visual-edit/code-env/python/spec/requirements.txt b/dss-plugin-visual-edit/code-env/python/spec/requirements.txt index 99df2c6..7287439 100644 --- a/dss-plugin-visual-edit/code-env/python/spec/requirements.txt +++ b/dss-plugin-visual-edit/code-env/python/spec/requirements.txt @@ -1,4 +1,4 @@ dash>=2.4.0 dash_extensions pydantic -pandas==1.5.3 \ No newline at end of file +pandas==1.3.5 \ No newline at end of file From e9a6a61e8d6d3877f83a5dd7ad90be52ae1947ac Mon Sep 17 00:00:00 2001 From: fabienDaou Date: Mon, 7 Oct 2024 15:56:13 +0200 Subject: [PATCH 2/5] Update corePackagesSet too. --- dss-plugin-visual-edit/code-env/python/desc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dss-plugin-visual-edit/code-env/python/desc.json b/dss-plugin-visual-edit/code-env/python/desc.json index f39475f..1e30f4b 100644 --- a/dss-plugin-visual-edit/code-env/python/desc.json +++ b/dss-plugin-visual-edit/code-env/python/desc.json @@ -3,7 +3,7 @@ "PYTHON38", "PYTHON39" ], - "corePackagesSet": "PANDAS15", + "corePackagesSet": "PANDAS13", "installCorePackages": true, "installJupyterSupport": false, "basePackagesInstallMethod": "PRE_BUILT", From 3aa1b126b7774b82762233d42514432fdc571fcb Mon Sep 17 00:00:00 2001 From: fabienDaou Date: Mon, 7 Oct 2024 17:30:36 +0200 Subject: [PATCH 3/5] Let user decide pandas version. --- dss-plugin-visual-edit/code-env/python/spec/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dss-plugin-visual-edit/code-env/python/spec/requirements.txt b/dss-plugin-visual-edit/code-env/python/spec/requirements.txt index 7287439..2c214a7 100644 --- a/dss-plugin-visual-edit/code-env/python/spec/requirements.txt +++ b/dss-plugin-visual-edit/code-env/python/spec/requirements.txt @@ -1,4 +1,3 @@ dash>=2.4.0 dash_extensions -pydantic -pandas==1.3.5 \ No newline at end of file +pydantic \ No newline at end of file From ed013d5c6b8aaf3ea93942135e8e5b0d66e74a64 Mon Sep 17 00:00:00 2001 From: fabienDaou Date: Mon, 7 Oct 2024 17:49:42 +0200 Subject: [PATCH 4/5] Fix issue with pandas 1.3. --- dss-plugin-visual-edit/python-lib/commons.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dss-plugin-visual-edit/python-lib/commons.py b/dss-plugin-visual-edit/python-lib/commons.py index bcc9dd2..aaf9707 100644 --- a/dss-plugin-visual-edit/python-lib/commons.py +++ b/dss-plugin-visual-edit/python-lib/commons.py @@ -212,7 +212,8 @@ def apply_edits_from_df(original_ds, edits_df): if col in primary_keys + display_columns + editable_columns: if is_integer_dtype(original_dtype): # there may be missing values so choose a dtype supporting them. - edits_df[col] = edits_df[col].astype(Int64Dtype()) + # Cast as float first to work around issue with pandas 1.3 https://stackoverflow.com/a/60024263 + edits_df[col] = edits_df[col].astype(float).astype(Int64Dtype()) elif is_float_dtype(original_dtype): edits_df[col] = edits_df[col].astype(float) else: From 53b2cd24b0723694857f45d5bbe21993fea4cdfb Mon Sep 17 00:00:00 2001 From: fabienDaou Date: Mon, 7 Oct 2024 17:50:17 +0200 Subject: [PATCH 5/5] Revert "Let user decide pandas version." This reverts commit 3aa1b126b7774b82762233d42514432fdc571fcb. --- dss-plugin-visual-edit/code-env/python/spec/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dss-plugin-visual-edit/code-env/python/spec/requirements.txt b/dss-plugin-visual-edit/code-env/python/spec/requirements.txt index 2c214a7..7287439 100644 --- a/dss-plugin-visual-edit/code-env/python/spec/requirements.txt +++ b/dss-plugin-visual-edit/code-env/python/spec/requirements.txt @@ -1,3 +1,4 @@ dash>=2.4.0 dash_extensions -pydantic \ No newline at end of file +pydantic +pandas==1.3.5 \ No newline at end of file