Skip to content

Commit

Permalink
GITC-3925 Updated protobuf-python
Browse files Browse the repository at this point in the history
  • Loading branch information
jtroberts committed Dec 6, 2022
1 parent df898a0 commit e874ad1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ WORKDIR /tmp/spatialindex-src-1.8.5
RUN ./configure --libdir=/usr/lib64
RUN make && make install
RUN ldconfig
RUN pip3.6 install protobuf==3.19.4 Fiona==1.8.13 Shapely==1.8.2 Rtree==0.9.7 mapbox-vector-tile==1.2.1
RUN pip3.6 install protobuf==3.19.5 Fiona==1.8.13 Shapely==1.8.2 Rtree==0.9.7 mapbox-vector-tile==1.2.1

WORKDIR /home/oe2
COPY ./ /home/oe2/onearth/
Expand Down
6 changes: 3 additions & 3 deletions docker/tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ RUN ./configure --libdir=/usr/lib64
RUN make && make install
RUN ldconfig
RUN pip3 install wheel==0.37.1
RUN pip3 install --prefix=/var/task --ignore-installed Fiona==1.8.19 Shapely==1.5.16 Rtree==0.9.7 mapbox_vector_tile==1.2.1 lxml==4.9.1 protobuf==3.19.4
RUN pip3 install --ignore-installed Fiona==1.8.19 Shapely==1.5.16 Rtree==0.9.7 mapbox_vector_tile==1.2.1 lxml==4.9.1 protobuf==3.19.4
RUN pip3 install --prefix=/var/task --ignore-installed Fiona==1.8.19 Shapely==1.5.16 Rtree==0.9.7 mapbox_vector_tile==1.2.1 lxml==4.9.1 protobuf==3.19.5
RUN pip3 install --ignore-installed Fiona==1.8.19 Shapely==1.5.16 Rtree==0.9.7 mapbox_vector_tile==1.2.1 lxml==4.9.1 protobuf==3.19.5
# TODO: Sort out weirdness with some dependencies expecting specific lib locations
RUN cp /usr/lib64/libspatialindex*so* /var/task/lib64/
RUN pip3 uninstall -y protobuf && pip3 install protobuf==3.19.4
RUN pip3 uninstall -y protobuf && pip3 install protobuf==3.19.5

RUN pip3 install matplotlib==2.2.5
RUN pip3 install pypng==0.0.20
Expand Down
2 changes: 1 addition & 1 deletion src/test/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
protobuf == 3.19.4 # https://pypi.org/project/protobuf/
protobuf == 3.19.5 # https://pypi.org/project/protobuf/
wheel == 0.37.1 # https://pypi.org/project/wheel/
Fiona == 1.8.13 # https://pypi.org/project/Fiona/
formencode == 1.3.1 # https://pypi.org/project/FormEncode/
Expand Down

0 comments on commit e874ad1

Please sign in to comment.