Skip to content
Snippets Groups Projects
Commit 1b0661bf authored by Ken Payson's avatar Ken Payson
Browse files

Rollback Dockerfile changes

parent 01b536c3
No related branches found
No related tags found
No related merge requests found
......@@ -75,8 +75,7 @@ RUN pip install --upgrade google-api-python-client
RUN apt-get update && apt-get install -y \
python-all-dev \
python3-all-dev \
python-pip \
python3-pip
python-pip
# Install Python packages from PyPI
RUN pip install pip --upgrade
......
......@@ -146,7 +146,6 @@ fi
############################
# Perform build operations #
############################
$PYTHON -m pip install virtualenv
# 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)
......
......@@ -247,15 +247,6 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS)
extra_args=extra_args + ['--build_only'],
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['python'],
configs=['dbg'],
platforms=['linux'],
arch='default',
compiler='python3.4',
labels=['portability'],
extra_args=extra_args,
inner_jobs=inner_jobs)
test_jobs += _generate_jobs(languages=['python'],
configs=['dbg'],
platforms=['linux'],
......
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