Skip to content

Commit

Permalink
Some extra updates to move torwards 3.0.0 version.
Browse files Browse the repository at this point in the history
  • Loading branch information
enriquetuya committed Mar 12, 2020
1 parent 49ee506 commit 72b9954
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
6 changes: 4 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ The format is based on [Keep a
Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## v3.0.0 - 2019-05-15
* [GlobalFishingWatch/pipe-segment/pull/101](https://github.com/GlobalFishingWatch/pipe-segment/pull/101)
- Support new version of gpsdio-segment, but continue to emit old style segments as well for backwards
compatibility. See PR for details
- Update to pipe-tools 3.0 and support Python 3.
- Improve memory usage significantly by cogrouping messages rather than passing as side arguments.
Also, filter out noise segments before grouping and use more temporary shards on output.
- Update to pipe-tools 3.1.1 and support Python 3.
- Upgrade Google SDK to 268 from 232
- Remove the fixed version of pip to 9

## v1.2.1 - 2019-05-15
* [GlobalFishingWatch/GFW-Tasks#1030](https://github.com/GlobalFishingWatch/GFW-Tasks/issues/1030) Changed the way we pass the machine type to dataflow so it re-allow us to send the custom machine type.
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ FROM python:3.7
RUN mkdir -p /opt/project
WORKDIR /opt/project

# Install and update pip
# Pin the version because pip>=10.0 does not support the --download flag which is required for dataflow
RUN pip install -U --ignore-installed pip==9.0.3
ENV CLOUD_SDK_VERSION 232.0.0

# Download and install google cloud. See the dockerfile at
# https://hub.docker.com/r/google/cloud-sdk/~/dockerfile/
ENV CLOUD_SDK_VERSION 268.0.0
RUN \
export CLOUD_SDK_APT_DEPS="curl gcc python-dev python-setuptools apt-transport-https lsb-release openssh-client git" && \
export CLOUD_SDK_PIP_DEPS="crcmod" && \
Expand Down
2 changes: 1 addition & 1 deletion pipe_segment/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""


__version__ = '1.2.1'
__version__ = '3.0.0'
__author__ = 'Paul Woods'
__email__ = '[email protected]'
__source__ = 'https://github.com/GlobalFishingWatch/pipe-segment'
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/gpsdio-segment/tar.gz/v0.19-dev#egg=gpsdio-segment
https://codeload.github.com/GlobalFishingWatch/pipe-tools/tar.gz/v3.1.0#egg=pipe-tools
https://codeload.github.com/GlobalFishingWatch/pipe-tools/tar.gz/v3.1.1#egg=pipe-tools
https://codeload.github.com/GlobalFishingWatch/ShipDataProcess/tar.gz/06b8495f55c6a44306ca9865b4c07d51d7ad5a7b#egg=shipdataprocess

0 comments on commit 72b9954

Please sign in to comment.