Skip to content
Snippets Groups Projects
Commit b3abfa6a authored by kpayson64's avatar kpayson64 Committed by GitHub
Browse files

Merge pull request #11374 from kpayson64/kokoro_python

Change Python Windows tests to 3.5
parents 6f816184 631862f4
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,8 @@ RUN pip install --upgrade google-api-python-client ...@@ -75,7 +75,8 @@ RUN pip install --upgrade google-api-python-client
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
python-all-dev \ python-all-dev \
python3-all-dev \ python3-all-dev \
python-pip python-pip \
python3-pip
# Install Python packages from PyPI # Install Python packages from PyPI
RUN pip install pip --upgrade RUN pip install pip --upgrade
......
...@@ -146,6 +146,7 @@ fi ...@@ -146,6 +146,7 @@ fi
############################ ############################
# Perform build operations # # Perform build operations #
############################ ############################
$PYTHON -m pip install virtualenv
# Instnatiate the virtualenv, preferring to do so from the relevant python # Instnatiate the virtualenv, preferring to do so from the relevant python
# version. Even if these commands fail (e.g. on Windows due to name conflicts) # version. Even if these commands fail (e.g. on Windows due to name conflicts)
......
...@@ -672,7 +672,7 @@ class PythonLanguage(object): ...@@ -672,7 +672,7 @@ class PythonLanguage(object):
if args.compiler == 'default': if args.compiler == 'default':
if os.name == 'nt': if os.name == 'nt':
return (python27_config,) return (python35_config,)
else: else:
return (python27_config, python34_config,) return (python27_config, python34_config,)
elif args.compiler == 'python2.7': elif args.compiler == 'python2.7':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment