Fixes: Removal of test folders

Author: sukrit007

2.7/Dockerfile

@@ -34,9 +34,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& rm -rf /usr/src/python
 
 # install "virtualenv", since the vast majority of users of this image will want it

2.7/alpine/Dockerfile

@@ -44,9 +44,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& runDeps="$( \
 		scanelf --needed --nobanner --recursive /usr/local \
 			| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

2.7/slim/Dockerfile

@@ -54,9 +54,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python
 

2.7/wheezy/Dockerfile

@@ -34,9 +34,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& rm -rf /usr/src/python
 
 # install "virtualenv", since the vast majority of users of this image will want it

3.3/Dockerfile

@@ -34,9 +34,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& rm -rf /usr/src/python
 
 # make some useful symlinks that are expected to exist

3.3/alpine/Dockerfile

@@ -44,9 +44,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& runDeps="$( \
 		scanelf --needed --nobanner --recursive /usr/local \
 			| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

3.3/slim/Dockerfile

@@ -54,9 +54,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python
 

3.3/wheezy/Dockerfile

@@ -34,9 +34,8 @@ RUN set -ex \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
 	&& pip install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& rm -rf /usr/src/python
 
 # make some useful symlinks that are expected to exist

3.4/Dockerfile

@@ -33,9 +33,8 @@ RUN set -ex \
 	&& ldconfig \
 	&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& rm -rf /usr/src/python
 
 # make some useful symlinks that are expected to exist

3.4/alpine/Dockerfile

@@ -44,9 +44,8 @@ RUN set -ex \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade --ignore-installed pip==$PYTHON_PIP_VERSION \
 	&& find /usr/local \
-		\( -type d -a -name test -o -name tests \) \
-		-o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
-		-exec rm -rf '{}' + \
+		\( -type d -a -name test -o -name tests \) -exec rm -rf '{}' + \
+    -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -f '{}' + \
 	&& runDeps="$( \
 		scanelf --needed --nobanner --recursive /usr/local \
 			| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \