Skip to content

Commit bc1563d

Browse files
committed
[FLINK-38590][python] Upgrade setuptools to >=75.3
This closes #27171.
1 parent 5681449 commit bc1563d

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

docs/content.zh/docs/deployment/resource-providers/standalone/docker.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
464464
RUN pip3 install apache-flink=={{< version >}}
465465
{{< /stable >}}
466466
{{< unstable >}}
467-
COPY apache-flink*.tar.gz /
468-
RUN pip3 install /apache-flink-libraries*.tar.gz && pip3 install /apache-flink*.tar.gz
467+
COPY apache_flink*.tar.gz /
468+
RUN pip3 install /apache_flink_libraries*.tar.gz && pip3 install /apache_flink*.tar.gz
469469
{{< /unstable >}}
470470
```
471471

docs/content/docs/deployment/resource-providers/standalone/docker.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,8 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
463463
RUN pip3 install apache-flink=={{< version >}}
464464
{{< /stable >}}
465465
{{< unstable >}}
466-
COPY apache-flink*.tar.gz /
467-
RUN pip3 install /apache-flink-libraries*.tar.gz && pip3 install /apache-flink*.tar.gz
466+
COPY apache_flink*.tar.gz /
467+
RUN pip3 install /apache_flink_libraries*.tar.gz && pip3 install /apache_flink*.tar.gz
468468
{{< /unstable >}}
469469
```
470470

flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ source "${CONDA_HOME}/bin/activate"
5252

5353
cd "${FLINK_PYTHON_DIR}"
5454

55+
pip install -r dev/dev-requirements.txt
56+
5557
if [[ -d "dist" ]]; then rm -Rf dist; fi
5658

5759
pushd apache-flink-libraries
@@ -68,8 +70,8 @@ rm -rf .conda/pkgs
6870

6971
deactivate
7072

71-
PYFLINK_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/dist/apache-flink-*.tar.gz)
72-
PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache-flink-libraries-*.tar.gz)
73+
PYFLINK_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/dist/apache_flink-*.tar.gz)
74+
PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache_flink_libraries-*.tar.gz)
7375
echo ${PYFLINK_PACKAGE_FILE}
7476
echo ${PYFLINK_LIBRARIES_PACKAGE_FILE}
7577
# Create a new docker image that has python and PyFlink installed.

flink-end-to-end-tests/test-scripts/test_pyflink_yarn.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ docker cp "${FLINK_PYTHON_TEST_DIR}/target/PythonUdfSqlJobExample.jar" master:/t
3939
docker cp "${FLINK_PYTHON_TEST_DIR}/python/add_one.py" master:/tmp/
4040
docker cp "${REQUIREMENTS_PATH}" master:/tmp/
4141
docker cp "${FLINK_PYTHON_TEST_DIR}/python/python_job.py" master:/tmp/
42-
PYFLINK_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/dist/apache-flink-*.tar.gz)
43-
PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache-flink-libraries-*.tar.gz)
42+
PYFLINK_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/dist/apache_flink-*.tar.gz)
43+
PYFLINK_LIBRARIES_PACKAGE_FILE=$(basename "${FLINK_PYTHON_DIR}"/apache-flink-libraries/dist/apache_flink_libraries-*.tar.gz)
4444
docker cp "${FLINK_PYTHON_DIR}/dist/${PYFLINK_PACKAGE_FILE}" master:/tmp/
4545
docker cp "${FLINK_PYTHON_DIR}/apache-flink-libraries/dist/${PYFLINK_LIBRARIES_PACKAGE_FILE}" master:/tmp/
4646

flink-python/dev/dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
pip>=20.3
16-
setuptools>=18.0
16+
setuptools>=75.3
1717
wheel
1818
apache-beam>=2.54.0,<=2.61.0
1919
cython>=0.29.24

flink-python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Minimum requirements for the build system to execute.
2020
requires = [
2121
"packaging>=20.5; platform_machine=='arm64'", # macos M1
22-
"setuptools>=18.0",
22+
"setuptools>=75.3",
2323
"wheel",
2424
"cython>=0.29.24,<3; sys_platform == 'darwin' and python_version == '3.8'",
2525
"fastavro==1.7.4; sys_platform == 'darwin' and python_version == '3.8'",

tools/releasing/create_binary_release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ make_python_release() {
9595
python setup.py sdist
9696
pushd dist/
9797
apache_flink_libraries_actual_name=`echo *.tar.gz`
98-
apache_flink_libraries_release_name="apache-flink-libraries-${PYFLINK_VERSION}.tar.gz"
98+
apache_flink_libraries_release_name="apache_flink_libraries-${PYFLINK_VERSION}.tar.gz"
9999

100100
if [[ "$apache_flink_libraries_actual_name" != "$apache_flink_libraries_release_name" ]] ; then
101101
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() {
112112
conda deactivate
113113
cd dist/
114114
pyflink_actual_name=`echo *.tar.gz`
115-
pyflink_release_name="apache-flink-${PYFLINK_VERSION}.tar.gz"
115+
pyflink_release_name="apache_flink-${PYFLINK_VERSION}.tar.gz"
116116

117117
if [[ "$pyflink_actual_name" != "$pyflink_release_name" ]] ; then
118118
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"

0 commit comments

Comments
 (0)