Skip to content
This repository has been archived by the owner on Mar 1, 2022. It is now read-only.

Commit

Permalink
fix: updating plugins to support optional, releasing v2.4.4 (#836)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-fenster authored Jul 25, 2020
1 parent 2b17348 commit 300eace
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ubuntu:16.04

# Release parameters
ENV GOOGLEAPIS_HASH e26e1839a45445d13cd45b1be3b1523defb72fee
ENV GAPIC_GENERATOR_HASH v2.4.3
ENV GAPIC_GENERATOR_HASH v2.4.4
# Define version number below. The ARTMAN_VERSION line is parsed by
# .circleci/config.yml and setup.py, please keep the format.
ENV ARTMAN_VERSION 2.4.3
ENV ARTMAN_VERSION 2.4.4

ENV DEBIAN_FRONTEND noninteractive

Expand Down Expand Up @@ -129,7 +129,7 @@ RUN curl -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar -o /usr/loca
&& cd /

# Used to add docstrings to the Python protoc output.
RUN pip3 install protoc-docs-plugin==0.6.1
RUN pip3 install git+https://github.com/googleapis/protoc-docs-plugin.git@proto3-optional#egg=protoc-docs-plugin

# Install .NET Core SDK
ENV DOTNET_SDK_VERSION 1.0.4
Expand Down Expand Up @@ -178,4 +178,6 @@ RUN pip install --upgrade setuptools
# Install artman.
ADD . /artman
ARG install_artman_from_source=false
# installing master version of plugin
RUN pip3 install git+https://github.com/googleapis/protoc-java-resource-names-plugin.git#egg=protoc-java-resource-names-plugin
RUN if [ "$install_artman_from_source" = true ]; then pip3 install -e /artman; else pip3 install googleapis-artman==$ARTMAN_VERSION; rm -r /artman; fi
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ oslo.utils>=3.41.0, <4.2.0
pbr >= 5.4.2, < 6.0.0
protobuf >= 3.9.0, < 4.0.0
protobuf3-to-dict==0.1.5
protoc-java-resource-names-plugin >= 0.0.25, < 0.1.0
requests >= 2.22.0, < 3.0.0
ruamel.yaml >= 0.16.0, < 0.17.0
six >= 1.12.0, < 2.0.0
Expand All @@ -20,3 +19,4 @@ taskflow==3.7.1
networkx==1.11
pypandoc >= 1.4, < 2.0
ply >= 3.8
pyyaml == 5.2

0 comments on commit 300eace

Please sign in to comment.