File tree 29 files changed +57
-56
lines changed
29 files changed +57
-56
lines changed Original file line number Diff line number Diff line change @@ -121,8 +121,8 @@ RUN set -ex \
121121 && find /usr/local -depth \
122122 \( \
123123 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
124- -o \
125- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
124+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
125+ -o \( -type f -a -name 'wininst-*.exe' \) \
126126 \) -exec rm -rf '{}' + \
127127 \
128128 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -121,8 +121,8 @@ RUN set -ex \
121121 && find /usr/local -depth \
122122 \( \
123123 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
124- -o \
125- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
124+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
125+ -o \( -type f -a -name 'wininst-*.exe' \) \
126126 \) -exec rm -rf '{}' + \
127127 \
128128 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -89,8 +89,8 @@ RUN set -ex \
8989 && find /usr/local -depth \
9090 \( \
9191 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
92- -o \
93- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
92+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
93+ -o \( -type f -a -name 'wininst-*.exe' \) \
9494 \) -exec rm -rf '{}' + \
9595 \
9696 && ldconfig \
Original file line number Diff line number Diff line change @@ -113,8 +113,8 @@ RUN set -ex \
113113 && find /usr/local -depth \
114114 \( \
115115 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
116- -o \
117- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
116+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
117+ -o \( -type f -a -name 'wininst-*.exe' \) \
118118 \) -exec rm -rf '{}' + \
119119 \
120120 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -89,8 +89,8 @@ RUN set -ex \
8989 && find /usr/local -depth \
9090 \( \
9191 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
92- -o \
93- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
92+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
93+ -o \( -type f -a -name 'wininst-*.exe' \) \
9494 \) -exec rm -rf '{}' + \
9595 \
9696 && ldconfig \
Original file line number Diff line number Diff line change @@ -113,8 +113,8 @@ RUN set -ex \
113113 && find /usr/local -depth \
114114 \( \
115115 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
116- -o \
117- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
116+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
117+ -o \( -type f -a -name 'wininst-*.exe' \) \
118118 \) -exec rm -rf '{}' + \
119119 \
120120 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -123,8 +123,8 @@ RUN set -ex \
123123 && find /usr/local -depth \
124124 \( \
125125 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
126- -o \
127- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
126+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
127+ -o \( -type f -a -name 'wininst-*.exe' \) \
128128 \) -exec rm -rf '{}' + \
129129 \
130130 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -123,8 +123,8 @@ RUN set -ex \
123123 && find /usr/local -depth \
124124 \( \
125125 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
126- -o \
127- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
126+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
127+ -o \( -type f -a -name 'wininst-*.exe' \) \
128128 \) -exec rm -rf '{}' + \
129129 \
130130 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -89,8 +89,8 @@ RUN set -ex \
8989 && find /usr/local -depth \
9090 \( \
9191 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
92- -o \
93- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
92+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
93+ -o \( -type f -a -name 'wininst-*.exe' \) \
9494 \) -exec rm -rf '{}' + \
9595 \
9696 && ldconfig \
Original file line number Diff line number Diff line change @@ -113,8 +113,8 @@ RUN set -ex \
113113 && find /usr/local -depth \
114114 \( \
115115 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
116- -o \
117- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
116+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
117+ -o \( -type f -a -name 'wininst-*.exe' \) \
118118 \) -exec rm -rf '{}' + \
119119 \
120120 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -89,8 +89,8 @@ RUN set -ex \
8989 && find /usr/local -depth \
9090 \( \
9191 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
92- -o \
93- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
92+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
93+ -o \( -type f -a -name 'wininst-*.exe' \) \
9494 \) -exec rm -rf '{}' + \
9595 \
9696 && ldconfig \
Original file line number Diff line number Diff line change @@ -113,8 +113,8 @@ RUN set -ex \
113113 && find /usr/local -depth \
114114 \( \
115115 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
116- -o \
117- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
116+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
117+ -o \( -type f -a -name 'wininst-*.exe' \) \
118118 \) -exec rm -rf '{}' + \
119119 \
120120 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -124,8 +124,8 @@ RUN set -ex \
124124 && find /usr/local -depth \
125125 \( \
126126 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
127- -o \
128- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
127+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
128+ -o \( -type f -a -name 'wininst-*.exe' \) \
129129 \) -exec rm -rf '{}' + \
130130 \
131131 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -124,8 +124,8 @@ RUN set -ex \
124124 && find /usr/local -depth \
125125 \( \
126126 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
127- -o \
128- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
127+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
128+ -o \( -type f -a -name 'wininst-*.exe' \) \
129129 \) -exec rm -rf '{}' + \
130130 \
131131 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -90,8 +90,8 @@ RUN set -ex \
9090 && find /usr/local -depth \
9191 \( \
9292 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
93- -o \
94- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
93+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
94+ -o \( -type f -a -name 'wininst-*.exe' \) \
9595 \) -exec rm -rf '{}' + \
9696 \
9797 && ldconfig \
Original file line number Diff line number Diff line change @@ -114,8 +114,8 @@ RUN set -ex \
114114 && find /usr/local -depth \
115115 \( \
116116 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
117- -o \
118- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
117+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
118+ -o \( -type f -a -name 'wininst-*.exe' \) \
119119 \) -exec rm -rf '{}' + \
120120 \
121121 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -90,8 +90,8 @@ RUN set -ex \
9090 && find /usr/local -depth \
9191 \( \
9292 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
93- -o \
94- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
93+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
94+ -o \( -type f -a -name 'wininst-*.exe' \) \
9595 \) -exec rm -rf '{}' + \
9696 \
9797 && ldconfig \
Original file line number Diff line number Diff line change @@ -114,8 +114,8 @@ RUN set -ex \
114114 && find /usr/local -depth \
115115 \( \
116116 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
117- -o \
118- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
117+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
118+ -o \( -type f -a -name 'wininst-*.exe' \) \
119119 \) -exec rm -rf '{}' + \
120120 \
121121 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -88,8 +88,8 @@ RUN set -ex \
8888 && find /usr/local -depth \
8989 \( \
9090 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
91- -o \
92- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
91+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
92+ -o \( -type f -a -name 'wininst-*.exe' \) \
9393 \) -exec rm -rf '{}' + \
9494 \
9595 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -88,8 +88,8 @@ RUN set -ex \
8888 && find /usr/local -depth \
8989 \( \
9090 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
91- -o \
92- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
91+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
92+ -o \( -type f -a -name 'wininst-*.exe' \) \
9393 \) -exec rm -rf '{}' + \
9494 \
9595 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -54,8 +54,8 @@ RUN set -ex \
5454 && find /usr/local -depth \
5555 \( \
5656 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
57- -o \
58- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
57+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
58+ -o \( -type f -a -name 'wininst-*.exe' \) \
5959 \) -exec rm -rf '{}' + \
6060 \
6161 && ldconfig \
Original file line number Diff line number Diff line change @@ -78,8 +78,8 @@ RUN set -ex \
7878 && find /usr/local -depth \
7979 \( \
8080 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
81- -o \
82- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
81+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
82+ -o \( -type f -a -name 'wininst-*.exe' \) \
8383 \) -exec rm -rf '{}' + \
8484 \
8585 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -88,8 +88,7 @@ RUN set -ex \
8888 && find /usr/local -depth \
8989 \( \
9090 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
91- -o \
92- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
91+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
9392 \) -exec rm -rf '{}' + \
9493 \
9594 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -88,8 +88,7 @@ RUN set -ex \
8888 && find /usr/local -depth \
8989 \( \
9090 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
91- -o \
92- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
91+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
9392 \) -exec rm -rf '{}' + \
9493 \
9594 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -54,8 +54,7 @@ RUN set -ex \
5454 && find /usr/local -depth \
5555 \( \
5656 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
57- -o \
58- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
57+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
5958 \) -exec rm -rf '{}' + \
6059 \
6160 && ldconfig \
Original file line number Diff line number Diff line change @@ -118,8 +118,8 @@ RUN set -ex \
118118 && find /usr/local -depth \
119119 \( \
120120 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
121- -o \
122- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
121+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
122+ -o \( -type f -a -name 'wininst-*.exe' \) \
123123 \) -exec rm -rf '{}' + \
124124 \
125125 && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec scanelf --needed --nobanner --format '%n#p' '{}' ';' \
Original file line number Diff line number Diff line change @@ -84,8 +84,8 @@ RUN set -ex \
8484 && find /usr/local -depth \
8585 \( \
8686 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
87- -o \
88- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
87+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
88+ -o \( -type f -a -name 'wininst-*.exe' \) \
8989 \) -exec rm -rf '{}' + \
9090 \
9191 && ldconfig \
Original file line number Diff line number Diff line change @@ -108,8 +108,8 @@ RUN set -ex \
108108 && find /usr/local -depth \
109109 \( \
110110 \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
111- -o \
112- \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
111+ -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) \) \
112+ -o \( -type f -a -name 'wininst-*.exe' \) \
113113 \) -exec rm -rf '{}' + \
114114 \
115115 && apt-mark auto '.*' > /dev/null \
Original file line number Diff line number Diff line change @@ -194,5 +194,9 @@ for version in "${versions[@]}"; do
194194 # https://github.com/python/cpython/pull/14910
195195 perl -0 -i -p -e " s![^\n]+PROFILE_TASK(='[^']+?')?[^\n]+\n!!gs" " $dir /Dockerfile"
196196 fi
197+ if [ " $minor " -ge 9 ]; then
198+ # "wininst-*.exe" is not installed for Unix platforms on Python 3.9+: https://github.com/python/cpython/pull/14511
199+ sed -ri -e ' /wininst/d' " $dir /Dockerfile"
200+ fi
197201 done
198202done
You can’t perform that action at this time.
0 commit comments