This is an automated email from the ASF dual-hosted git repository.
ruifengz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 72534072b88 [SPARK-46146][INFRA] Unpin `markupsafe`
72534072b88 is described below
commit 72534072b88b6ef1c4ddf0714b33ce08d274d4da
Author: Ruifeng Zheng <ruife...@apache.org>
AuthorDate: Wed Nov 29 11:06:20 2023 +0800
[SPARK-46146][INFRA] Unpin `markupsafe`
### What changes were proposed in this pull request?
Unpin `markupsafe`
### Why are the changes needed?
latest version no longer causes `"ImportError: cannot import name
'soft_unicode' from 'markupsafe'
(/usr/local/lib/python3.9/dist-packages/markupsafe/{}init{}.py)"` mentioned in
https://issues.apache.org/jira/browse/SPARK-38279
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
ci
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #44062 from zhengruifeng/infra_unpin_MarkupSafe.
Authored-by: Ruifeng Zheng <ruife...@apache.org>
Signed-off-by: Ruifeng Zheng <ruife...@apache.org>
---
.github/workflows/build_and_test.yml | 4 +---
dev/requirements.txt | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index 87ef4054894..14018fee473 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -742,9 +742,7 @@ jobs:
Rscript -e "devtools::install_version('preferably', version='0.4',
repos='https://cloud.r-project.org')"
- name: Install dependencies for documentation generation
run: |
- # Pin the MarkupSafe to 2.0.1 to resolve the CI error.
- # See also https://issues.apache.org/jira/browse/SPARK-38279.
- python3.9 -m pip install 'sphinx==4.2.0' mkdocs
'pydata_sphinx_theme>=0.13' sphinx-copybutton nbsphinx numpydoc jinja2
'markupsafe==2.0.1' 'pyzmq<24.0.0'
+ python3.9 -m pip install 'sphinx==4.2.0' mkdocs
'pydata_sphinx_theme>=0.13' sphinx-copybutton nbsphinx numpydoc jinja2
markupsafe 'pyzmq<24.0.0'
python3.9 -m pip install ipython_genutils # See SPARK-38517
python3.9 -m pip install sphinx_plotly_directive 'numpy>=1.20.0'
pyarrow pandas 'plotly>=4.8'
python3.9 -m pip install 'docutils<0.18.0' # See SPARK-39421
diff --git a/dev/requirements.txt b/dev/requirements.txt
index 2d139911bac..026ae2e3b4e 100644
--- a/dev/requirements.txt
+++ b/dev/requirements.txt
@@ -40,8 +40,7 @@ sphinx==4.2.0
sphinx-plotly-directive
sphinx-copybutton
docutils<0.18.0
-# See SPARK-38279.
-markupsafe==2.0.1
+markupsafe
# Development scripts
jira>=3.5.2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
