Skip to content

Commit

Permalink
Remove tox
Browse files Browse the repository at this point in the history
  • Loading branch information
soltanmm-google committed Jul 1, 2016
1 parent 3b5b206 commit ac586ba
Show file tree
Hide file tree
Showing 12 changed files with 7 additions and 38 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ cython_debug/
python_build/
.coverage*
.eggs
.tox
htmlcov/
dist/
*.egg
Expand Down
1 change: 0 additions & 1 deletion MANIFEST.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* [requirements.txt](requirements.txt)
* [setup.cfg](setup.cfg)
* [setup.py](setup.py)
* [tox.ini](tox.ini)
* [PYTHON-MANIFEST.in](PYTHON-MANIFEST.in)

## Ruby
Expand Down
1 change: 0 additions & 1 deletion src/python/grpcio/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dist/
.coverage
.coverage.*
.cache/
.tox/
nosetests.xml
doc/
_grpcio_metadata.py
Expand Down
2 changes: 1 addition & 1 deletion templates/tools/dockerfile/python_deps.include
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ RUN apt-get update && apt-get install -y ${'\\'}
# Install Python packages from PyPI
RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2
2 changes: 1 addition & 1 deletion tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \

RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2


##################
Expand Down
2 changes: 1 addition & 1 deletion tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \

RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2


##################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \
# Install Python packages from PyPI
RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2

# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RUN apt-get update && apt-get install -y \
# Install Python packages from PyPI
RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2


RUN pip install coverage
Expand Down
2 changes: 1 addition & 1 deletion tools/dockerfile/test/multilang_jessie_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ RUN apt-get update && apt-get install -y \
# Install Python packages from PyPI
RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2

# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
Expand Down
2 changes: 1 addition & 1 deletion tools/dockerfile/test/python_jessie_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \
# Install Python packages from PyPI
RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 tox
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2

# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
Expand Down
2 changes: 0 additions & 2 deletions tools/gce/linux_performance_worker_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,11 @@ sudo apt-get install -y libgflags-dev libgtest-dev libc++-dev clang
# Python dependencies
sudo pip install tabulate
sudo pip install google-api-python-client
sudo pip install tox

curl -O https://bootstrap.pypa.io/get-pip.py
sudo pypy get-pip.py
sudo pypy -m pip install tabulate
sudo pip install google-api-python-client
sudo pip install tox

# Node dependencies (nvm has to be installed under user jenkins)
touch .profile
Expand Down
26 changes: 0 additions & 26 deletions tox.ini

This file was deleted.

0 comments on commit ac586ba

Please sign in to comment.