Skip to content

Commit f737799

Browse files
committed
[SPARK-54159][INFRA] Fix pip install commands to use proper quotation marks
### What changes were proposed in this pull request? This PR aims to a few `pip install` command to use proper quotation marks like the following. ``` -RUN python3.13 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this +RUN python3.13 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this ``` ``` -RUN python3.13 -m pip install numpy>=2.1 pyarrow>=18.0.0 six==1.16.0 pandas==2.3.3 scipy coverage matplotlib openpyxl grpcio==1.67.0 grpcio-status==1.67.0 lxml jinja2 && \ +RUN python3.13 -m pip install 'numpy>=2.1' 'pyarrow>=18.0.0' 'six==1.16.0' 'pandas==2.3.3' scipy coverage matplotlib openpyxl 'grpcio==1.67.0' 'grpcio-status==1.67.0' lxml jinja2 && \ ``` ### Why are the changes needed? SHELL handles `>=` before `pip install` command receives it. ### Does this PR introduce _any_ user-facing change? No behavior change because this is only changing infra. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. This patch had conflicts when merged, resolved by Committer: Dongjoon Hyun <[email protected]> Closes #52857 from dongjoon-hyun/SPARK-54159. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit 37689bf) Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent fb16a1e commit f737799

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

dev/create-release/spark-rm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
9898

9999
# Install Python 3.10 packages
100100
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10
101-
RUN python3.10 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
101+
RUN python3.10 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
102102
RUN python3.10 -m pip install --ignore-installed 'six==1.16.0' # Avoid `python3-six` installation
103103
RUN python3.10 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS && \
104104
python3.10 -m pip install 'torch<2.6.0' torchvision --index-url https://download.pytorch.org/whl/cpu && \

dev/infra/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
101101

102102
# Install Python 3.10 packages
103103
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10
104-
RUN python3.10 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
104+
RUN python3.10 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
105105
RUN python3.10 -m pip install --ignore-installed 'six==1.16.0' # Avoid `python3-six` installation
106106
RUN python3.10 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS && \
107107
python3.10 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
@@ -114,7 +114,7 @@ RUN apt-get update && apt-get install -y \
114114
python3.9 python3.9-distutils \
115115
&& rm -rf /var/lib/apt/lists/*
116116
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.9
117-
RUN python3.9 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
117+
RUN python3.9 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
118118
RUN python3.9 -m pip install --force $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS && \
119119
python3.9 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
120120
python3.9 -m pip install torcheval && \
@@ -125,7 +125,7 @@ RUN apt-get update && apt-get install -y \
125125
python3.11 \
126126
&& rm -rf /var/lib/apt/lists/*
127127
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
128-
RUN python3.11 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
128+
RUN python3.11 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
129129
RUN python3.11 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS && \
130130
python3.11 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
131131
python3.11 -m pip install deepspeed torcheval && \
@@ -136,7 +136,7 @@ RUN apt-get update && apt-get install -y \
136136
python3.12 \
137137
&& rm -rf /var/lib/apt/lists/*
138138
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12
139-
RUN python3.12 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
139+
RUN python3.12 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
140140
RUN python3.12 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS lxml && \
141141
python3.12 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
142142
python3.12 -m pip install torcheval && \
@@ -148,8 +148,8 @@ RUN apt-get update && apt-get install -y \
148148
&& rm -rf /var/lib/apt/lists/*
149149
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.13
150150
# TODO(SPARK-49862) Add BASIC_PIP_PKGS and CONNECT_PIP_PKGS to Python 3.13 image when it supports Python 3.13
151-
RUN python3.13 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
152-
RUN python3.13 -m pip install numpy>=2.1 pyarrow>=18.0.0 six==1.16.0 pandas==2.3.3 scipy coverage matplotlib openpyxl grpcio==1.76.0 grpcio-status==1.76.0 lxml jinja2 && \
151+
RUN python3.13 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
152+
RUN python3.13 -m pip install 'numpy>=2.1' 'pyarrow>=18.0.0' 'six==1.16.0' 'pandas==2.3.3' scipy coverage matplotlib openpyxl 'grpcio==1.76.0' 'grpcio-status==1.76.0' lxml jinja2 && \
153153
python3.13 -m pip cache purge
154154

155155
# Remove unused installation packages to free up disk space

dev/spark-test-image/numpy-213/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
7575

7676
# Install Python 3.11 packages
7777
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
78-
RUN python3.11 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
78+
RUN python3.11 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
7979
RUN python3.11 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS && \
8080
python3.11 -m pip cache purge

dev/spark-test-image/python-310/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
7070

7171
# Install Python 3.10 packages
7272
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10
73-
RUN python3.10 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
73+
RUN python3.10 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
7474
RUN python3.10 -m pip install --ignore-installed 'six==1.16.0' # Avoid `python3-six` installation
7575
RUN python3.10 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS && \
7676
python3.10 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \

dev/spark-test-image/python-311-classic-only/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ARG TEST_PIP_PKGS="coverage unittest-xml-reporting"
7373

7474
# Install Python 3.11 packages
7575
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
76-
RUN python3.11 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
76+
RUN python3.11 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
7777
RUN python3.11 -m pip install $BASIC_PIP_PKGS $TEST_PIP_PKGS && \
7878
python3.11 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
7979
python3.11 -m pip install deepspeed torcheval && \

dev/spark-test-image/python-311/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
7474

7575
# Install Python 3.11 packages
7676
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11
77-
RUN python3.11 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
77+
RUN python3.11 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
7878
RUN python3.11 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS && \
7979
python3.11 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
8080
python3.11 -m pip install deepspeed torcheval && \

dev/spark-test-image/python-312/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
7474

7575
# Install Python 3.12 packages
7676
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12
77-
RUN python3.12 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
77+
RUN python3.12 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
7878
RUN python3.12 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS lxml && \
7979
python3.12 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
8080
python3.12 -m pip install torcheval && \

dev/spark-test-image/python-313-nogil/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
7676
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.13t
7777
# TODO: Add BASIC_PIP_PKGS and CONNECT_PIP_PKGS when it supports Python 3.13 free threaded
7878
# TODO: Add lxml, grpcio, grpcio-status back when they support Python 3.13 free threaded
79-
RUN python3.13t -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
80-
RUN python3.13t -m pip install numpy>=2.1 pyarrow>=19.0.0 six==1.16.0 pandas==2.3.3 scipy coverage matplotlib openpyxl jinja2 && \
79+
RUN python3.13t -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
80+
RUN python3.13t -m pip install 'numpy>=2.1' 'pyarrow>=19.0.0' 'six==1.16.0' 'pandas==2.3.3' scipy coverage matplotlib openpyxl jinja2 && \
8181
python3.13t -m pip cache purge

dev/spark-test-image/python-313/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
7474

7575
# Install Python 3.13 packages
7676
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.13
77-
RUN python3.13 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
77+
RUN python3.13 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
7878
RUN python3.13 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS lxml && \
7979
python3.13 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
8080
python3.13 -m pip install torcheval && \

dev/spark-test-image/python-314/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ARG CONNECT_PIP_PKGS="grpcio==1.76.0 grpcio-status==1.76.0 protobuf==6.33.0 goog
7474

7575
# Install Python 3.14 packages
7676
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.14
77-
RUN python3.14 -m pip install --ignore-installed blinker>=1.6.2 # mlflow needs this
77+
RUN python3.14 -m pip install --ignore-installed 'blinker>=1.6.2' # mlflow needs this
7878
RUN python3.14 -m pip install $BASIC_PIP_PKGS unittest-xml-reporting $CONNECT_PIP_PKGS lxml && \
7979
python3.14 -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu && \
8080
python3.14 -m pip install torcheval && \

0 commit comments

Comments
 (0)