This is an automated email from the ASF dual-hosted git repository.
dianfu pushed a commit to branch release-1.20
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.20 by this push:
new 1744e5fe3f9 [FLINK-38590][python] Upgrade setuptools to >=75.3 (#27173)
1744e5fe3f9 is described below
commit 1744e5fe3f962c6a334258afe73c1934cb0c0399
Author: Dian Fu <[email protected]>
AuthorDate: Fri Nov 7 19:01:09 2025 +0800
[FLINK-38590][python] Upgrade setuptools to >=75.3 (#27173)
---
.../docs/deployment/resource-providers/standalone/docker.md | 4 ++--
.../content/docs/deployment/resource-providers/standalone/docker.md | 4 ++--
.../test-scripts/test_kubernetes_pyflink_application.sh | 6 ++++--
flink-end-to-end-tests/test-scripts/test_pyflink.sh | 6 +++++-
flink-end-to-end-tests/test-scripts/test_pyflink_yarn.sh | 4 ++--
flink-python/dev/dev-requirements.txt | 2 +-
flink-python/pyproject.toml | 2 +-
tools/releasing/create_binary_release.sh | 4 ++--
8 files changed, 19 insertions(+), 13 deletions(-)
diff --git
a/docs/content.zh/docs/deployment/resource-providers/standalone/docker.md
b/docs/content.zh/docs/deployment/resource-providers/standalone/docker.md
index b618b411303..fa17ba7c885 100644
--- a/docs/content.zh/docs/deployment/resource-providers/standalone/docker.md
+++ b/docs/content.zh/docs/deployment/resource-providers/standalone/docker.md
@@ -464,8 +464,8 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
RUN pip3 install apache-flink=={{< version >}}
{{< /stable >}}
{{< unstable >}}
-COPY apache-flink*.tar.gz /
-RUN pip3 install /apache-flink-libraries*.tar.gz && pip3 install
/apache-flink*.tar.gz
+COPY apache_flink*.tar.gz /
+RUN pip3 install /apache_flink_libraries*.tar.gz && pip3 install
/apache_flink*.tar.gz
{{< /unstable >}}
```
diff --git
a/docs/content/docs/deployment/resource-providers/standalone/docker.md
b/docs/content/docs/deployment/resource-providers/standalone/docker.md
index a6614c7e111..384912d5b9e 100644
--- a/docs/content/docs/deployment/resource-providers/standalone/docker.md
+++ b/docs/content/docs/deployment/resource-providers/standalone/docker.md
@@ -463,8 +463,8 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
RUN pip3 install apache-flink=={{< version >}}
{{< /stable >}}
{{< unstable >}}
-COPY apache-flink*.tar.gz /
-RUN pip3 install /apache-flink-libraries*.tar.gz && pip3 install
/apache-flink*.tar.gz
+COPY apache_flink*.tar.gz /
+RUN pip3 install /apache_flink_libraries*.tar.gz && pip3 install
/apache_flink*.tar.gz
{{< /unstable >}}
```
diff --git
a/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
index 550ec4bf9c2..bc6ce8924ce 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
@@ -52,6 +52,8 @@ source "${CONDA_HOME}/bin/activate"
cd "${FLINK_PYTHON_DIR}"
+pip install -r dev/dev-requirements.txt
+
if [[ -d "dist" ]]; then rm -Rf dist; fi
pushd apache-flink-libraries
@@ -68,8 +70,8 @@ rm -rf .conda/pkgs
deactivate
-PYFLINK_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/dist/apache-flink-*.tar.gz)
-PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache-flink-libraries-*.tar.gz)
+PYFLINK_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/dist/apache_flink-*.tar.gz)
+PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache_flink_libraries-*.tar.gz)
echo ${PYFLINK_PACKAGE_FILE}
echo ${PYFLINK_LIBRARIES_PACKAGE_FILE}
# Create a new docker image that has python and PyFlink installed.
diff --git a/flink-end-to-end-tests/test-scripts/test_pyflink.sh
b/flink-end-to-end-tests/test-scripts/test_pyflink.sh
index a078e84da6b..8c0387daf7e 100755
--- a/flink-end-to-end-tests/test-scripts/test_pyflink.sh
+++ b/flink-end-to-end-tests/test-scripts/test_pyflink.sh
@@ -239,7 +239,11 @@ JOB_ID=$(${FLINK_DIR}/bin/flink run \
-j "${KAFKA_SQL_JAR}")
echo "${JOB_ID}"
-JOB_ID=`echo "${JOB_ID}" | sed 's/.* //g'`
+# After bump the setuptools, there are warnings such as "The pkg_resources
+# package is slated for removal as early as 2025-11-30. Refrain from using
+# this package or pin to Setuptools<81.
+# import pkg_resources" in the output of `flink run`, need adjust the way to
parse the JOB_ID
+JOB_ID=`echo "${JOB_ID}" | sed -n 's/.*JobID //p'`
wait_job_running ${JOB_ID}
diff --git a/flink-end-to-end-tests/test-scripts/test_pyflink_yarn.sh
b/flink-end-to-end-tests/test-scripts/test_pyflink_yarn.sh
index 2a5e8375b7d..49ae36d2b1d 100755
--- a/flink-end-to-end-tests/test-scripts/test_pyflink_yarn.sh
+++ b/flink-end-to-end-tests/test-scripts/test_pyflink_yarn.sh
@@ -39,8 +39,8 @@ docker cp
"${FLINK_PYTHON_TEST_DIR}/target/PythonUdfSqlJobExample.jar" master:/t
docker cp "${FLINK_PYTHON_TEST_DIR}/python/add_one.py" master:/tmp/
docker cp "${REQUIREMENTS_PATH}" master:/tmp/
docker cp "${FLINK_PYTHON_TEST_DIR}/python/python_job.py" master:/tmp/
-PYFLINK_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/dist/apache-flink-*.tar.gz)
-PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache-flink-libraries-*.tar.gz)
+PYFLINK_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/dist/apache_flink-*.tar.gz)
+PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename
"${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache_flink_libraries-*.tar.gz)
docker cp "${FLINK_PYTHON_DIR}/dist/${PYFLINK_PACKAGE_FILE}" master:/tmp/
docker cp
"${FLINK_PYTHON_DIR}/apache-flink-libraries/dist/${PYFLINK_LIBRARIES_PACKAGE_FILE}"
master:/tmp/
diff --git a/flink-python/dev/dev-requirements.txt
b/flink-python/dev/dev-requirements.txt
index 3707dcee192..11bf6894b27 100755
--- a/flink-python/dev/dev-requirements.txt
+++ b/flink-python/dev/dev-requirements.txt
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
pip>=20.3
-setuptools>=18.0
+setuptools>=75.3
wheel
apache-beam>=2.43.0,<2.49.0
cython>=0.29.24
diff --git a/flink-python/pyproject.toml b/flink-python/pyproject.toml
index cfdbdd1fb6d..40cb53932ff 100644
--- a/flink-python/pyproject.toml
+++ b/flink-python/pyproject.toml
@@ -19,7 +19,7 @@
# Minimum requirements for the build system to execute.
requires = [
"packaging>=20.5; platform_machine=='arm64'", # macos M1
- "setuptools>=18.0",
+ "setuptools>=75.3",
"wheel",
"cython>=0.29.24,<3; sys_platform == 'darwin' and python_version == '3.8'",
"fastavro==1.7.4; sys_platform == 'darwin' and python_version == '3.8'",
diff --git a/tools/releasing/create_binary_release.sh
b/tools/releasing/create_binary_release.sh
index 63dc6aa2377..ca9f1ad2967 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -95,7 +95,7 @@ make_python_release() {
python setup.py sdist
pushd dist/
apache_flink_libraries_actual_name=`echo *.tar.gz`
-
apache_flink_libraries_release_name="apache-flink-libraries-${PYFLINK_VERSION}.tar.gz"
+
apache_flink_libraries_release_name="apache_flink_libraries-${PYFLINK_VERSION}.tar.gz"
if [[ "$apache_flink_libraries_actual_name" !=
"$apache_flink_libraries_release_name" ]] ; then
echo -e "\033[31;1mThe file name of the python package:
${apache_flink_libraries_actual_name} is not consistent with given release
version: ${PYFLINK_VERSION}!\033[0m"
@@ -112,7 +112,7 @@ make_python_release() {
conda deactivate
cd dist/
pyflink_actual_name=`echo *.tar.gz`
- pyflink_release_name="apache-flink-${PYFLINK_VERSION}.tar.gz"
+ pyflink_release_name="apache_flink-${PYFLINK_VERSION}.tar.gz"
if [[ "$pyflink_actual_name" != "$pyflink_release_name" ]] ; then
echo -e "\033[31;1mThe file name of the python package:
${pyflink_actual_name} is not consistent with given release version:
${PYFLINK_VERSION}!\033[0m"
