Merge pull request grpc#21339 from grpc/revert-21271-py3.8-windows

Revert "Release Python3.8 wheels for Windows"

tools/internal_ci/helper_scripts/prepare_build_windows.bat

@@ -35,9 +35,6 @@ python -m pip install google-api-python-client
 powershell -File src\csharp\install_dotnet_sdk.ps1
 set PATH=%LOCALAPPDATA%\Microsoft\dotnet;%PATH%
 
-@rem Install Python 3.8.0
-powershell -File tools\internal_ci\helper_scripts\install_python38.ps1
-
 @rem Newest version of Go is required to be able to build boringssl with cmake
 @rem TODO(jtattermusch): try to eliminate the dependency on Go
 choco install golang -y --version 1.13.1 --limit-output

tools/internal_ci/windows/grpc_build_artifacts.bat

@@ -12,6 +12,13 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 
+@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
+@rem TODO(jtattermusch): get rid of this hack
+rename C:\Python27_32bit Python27_32bits
+rename C:\Python35_32bit Python35_32bits
+rename C:\Python36_32bit Python36_32bits
+rename C:\Python37_32bit Python37_32bits
+
 @rem Boringssl build no longer supports yasm
 choco uninstall yasm -y --limit-output
 choco install nasm -y --limit-output

tools/internal_ci/windows/grpc_build_packages.bat

@@ -12,6 +12,12 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 
+@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
+@rem TODO(jtattermusch): get rid of this hack
+rename C:\Python27_32bit Python27_32bits
+rename C:\Python35_32bit Python35_32bits
+rename C:\Python36_32bit Python36_32bits
+
 @rem enter repo root
 cd /d %~dp0\..\..\..
 

tools/internal_ci/windows/grpc_distribtests.bat

@@ -12,6 +12,12 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 
+@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
+@rem TODO(jtattermusch): get rid of this hack
+rename C:\Python27_32bit Python27_32bits
+rename C:\Python35_32bit Python35_32bits
+rename C:\Python36_32bit Python36_32bits
+
 @rem enter repo root
 cd /d %~dp0\..\..\..
 

tools/internal_ci/windows/grpc_distribtests_standalone.bat

@@ -12,6 +12,12 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 
+@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
+@rem TODO(jtattermusch): get rid of this hack
+rename C:\Python27_32bit Python27_32bits
+rename C:\Python35_32bit Python35_32bits
+rename C:\Python36_32bit Python36_32bits
+
 @rem enter repo root
 cd /d %~dp0\..\..\..
 

tools/run_tests/artifacts/artifact_targets.py

@@ -407,16 +407,18 @@ def targets():
         PythonArtifact('macos', 'x64', 'python3.6'),
         PythonArtifact('macos', 'x64', 'python3.7'),
         PythonArtifact('macos', 'x64', 'python3.8'),
-        PythonArtifact('windows', 'x86', 'Python27_32bit'),
-        PythonArtifact('windows', 'x86', 'Python35_32bit'),
-        PythonArtifact('windows', 'x86', 'Python36_32bit'),
-        PythonArtifact('windows', 'x86', 'Python37_32bit'),
-        PythonArtifact('windows', 'x86', 'Python38_32bit'),
+        PythonArtifact('windows', 'x86', 'Python27_32bits'),
+        PythonArtifact('windows', 'x86', 'Python35_32bits'),
+        PythonArtifact('windows', 'x86', 'Python36_32bits'),
+        PythonArtifact('windows', 'x86', 'Python37_32bits'),
+        # TODO(https://github.com/grpc/grpc/issues/20615) Enable this artifact
+        # PythonArtifact('windows', 'x86', 'Python38_32bits'),
         PythonArtifact('windows', 'x64', 'Python27'),
         PythonArtifact('windows', 'x64', 'Python35'),
         PythonArtifact('windows', 'x64', 'Python36'),
         PythonArtifact('windows', 'x64', 'Python37'),
-        PythonArtifact('windows', 'x64', 'Python38'),
+        # TODO(https://github.com/grpc/grpc/issues/20615) Enable this artifact
+        # PythonArtifact('windows', 'x64', 'Python38'),
         RubyArtifact('linux', 'x64'),
         RubyArtifact('macos', 'x64'),
         PHPArtifact('linux', 'x64')

tools/run_tests/artifacts/build_artifact_python.bat

@@ -15,10 +15,10 @@
 @rem set path to python & mingw compiler
 set PATH=C:\%1;C:\%1\scripts;C:\msys64\mingw%2\bin;C:\tools\msys64\mingw%2\bin;%PATH%
 
-python -m pip install --upgrade six
+pip install --upgrade six
 @rem some artifacts are broken for setuptools 38.5.0. See https://github.com/grpc/grpc/issues/14317
-python -m pip install --upgrade setuptools==38.2.4
-python -m pip install -rrequirements.txt
+pip install --upgrade setuptools==38.2.4
+pip install -rrequirements.txt
 
 set GRPC_PYTHON_BUILD_WITH_CYTHON=1