Skip to content

Commit

Permalink
Prepare new staging run:
Browse files Browse the repository at this point in the history
- Upgrade google sdk to 232
- Use new pipe-tools version that pins version for panda
  • Loading branch information
enriquetuya committed Feb 5, 2019
1 parent d3a7129 commit dbd7106
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN \
apt-get -qqy update && \
apt-get install -qqy $CLOUD_SDK_APT_DEPS && \
pip install -U $CLOUD_SDK_PIP_DEPS && \
export CLOUD_SDK_VERSION="198.0.0" && \
export CLOUD_SDK_VERSION="232.0.0" && \
export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
echo "deb https://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" > /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
Expand Down
3 changes: 2 additions & 1 deletion pipe_segment/io/gcp/gcpsource.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ def __init__(self, gcp_path, first_date_ts=None, last_date_ts=None):
if self.service == 'table':
helper = QueryHelper(table=self.path,
first_date_ts=self.first_date_ts,
last_date_ts=self.last_date_ts)
last_date_ts=self.last_date_ts,
use_legacy_sql=False)
self.query = helper.build_query()
if self.schema is None:
self.schema = helper.table_schema
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
https://codeload.github.com/GlobalFishingWatch/pipe-tools/tar.gz/v0.1.7#egg=pipe-tools-0.1.7
https://codeload.github.com/GlobalFishingWatch/pipe-tools/tar.gz/v0.2.5#egg=pipe-tools-0.2.5
https://codeload.github.com/Skytruth/gpsdio-segment/tar.gz/v0.13-dev#egg=gpsdio-segment-0.13-dev0
https://codeload.github.com/GlobalFishingWatch/ShipDataProcess/tar.gz/06b8495f55c6a44306ca9865b4c07d51d7ad5a7b#egg=shipdataprocess-0.5.8
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"udatetime",
"newlinejson",
"python-stdnum",
"pipe-tools==0.1.7",
"pipe-tools==0.2.5",
"gpsdio-segment==0.13-dev0",
"shipdataprocess==0.5.8",
"jinja2-cli",
Expand Down

0 comments on commit dbd7106

Please sign in to comment.