Skip to content
This repository was archived by the owner on Dec 8, 2021. It is now read-only.

Commit a1218dc

Browse files
authored
ci: update builds to use Python 3 (#191)
1 parent 2c170f8 commit a1218dc

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

ci/kokoro/docker/Dockerfile.ubuntu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN apt-get update && \
2828
clang \
2929
cmake \
3030
curl \
31+
ctags \
3132
doxygen \
3233
gawk \
3334
git \

ci/kokoro/docker/Dockerfile.ubuntu-install

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ RUN apt-get update && \
2929
clang \
3030
clang-format-7 \
3131
cmake \
32+
ctags \
3233
curl \
3334
doxygen \
3435
gawk \
@@ -42,7 +43,8 @@ RUN apt-get update && \
4243
make \
4344
ninja-build \
4445
pkg-config \
45-
python-pip \
46+
python3 \
47+
python3-pip \
4648
shellcheck \
4749
tar \
4850
unzip \
@@ -68,8 +70,8 @@ RUN chmod 755 /usr/bin/buildifier
6870
# Pin this to an specific version because the formatting changes when the
6971
# "latest" version is updated, and we do not want the builds to break just
7072
# because some third party changed something.
71-
RUN pip install --upgrade pip
72-
RUN pip install cmake_format==0.6.8
73+
RUN pip3 install --upgrade pip
74+
RUN pip3 install setuptools cmake_format==0.6.8
7375

7476
# Install protobuf using CMake. Some distributions include protobuf, but gRPC
7577
# requires 3.4.x or newer, and many of those distribution use older versions.

doc/setup-development-environment.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,9 @@ version is updated, and we do not want the builds to break just
4545
because some third party changed something.
4646

4747
```console
48-
sudo apt install -y python python-pip
49-
pip install --upgrade pip
50-
pip install numpy cmake_format==0.6.8
51-
```
52-
53-
Install the Python modules used in the integration tests:
54-
55-
```console
56-
pip install flask httpbin gevent gunicorn --user
48+
sudo apt install -y python3 python3-pip
49+
pip3 install --upgrade pip
50+
pip3 install numpy cmake_format==0.6.8
5751
```
5852

5953
Add the pip directory to your PATH:

0 commit comments

Comments
 (0)