Skip to content

Commit

Permalink
Merge pull request #7 from GlobalFishingWatch/feature/PIPELINE-1419
Browse files Browse the repository at this point in the history
Updates to py-3.8 and updates all the required dependencies.
  • Loading branch information
smpiano authored Jan 23, 2024
2 parents 33f58f1 + 2ac82fb commit 5a311cb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/world-fishing-827/github.com/globalfishingwatch/gfw-pipeline:latest-python3.7
FROM gcr.io/world-fishing-827/github.com/globalfishingwatch/gfw-pipeline:latest-python3.8

RUN apt-get -y install gdal-bin libgdal-dev

Expand Down
17 changes: 3 additions & 14 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,9 @@ steps:
'${_BASE_IMAGE_NAME}:latest',
]

- name: 'gcr.io/cloud-builders/docker'
id: push-tag
args: [
'push',
'${_BASE_IMAGE_NAME}:${TAG_NAME}'
]

- name: 'gcr.io/cloud-builders/docker'
id: push-latest
args: [
'push',
'${_BASE_IMAGE_NAME}:latest'
]

images:
- '${_BASE_IMAGE_NAME}:${TAG_NAME}'
- '${_BASE_IMAGE_NAME}:latest'
timeout: 600s
substitutions:
_BASE_IMAGE_NAME: 'gcr.io/${PROJECT_ID}/pipe-satellite-data'
Expand Down
13 changes: 0 additions & 13 deletions install.sh

This file was deleted.

18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
NewlineJSON==1.0
ephem==3.7.7.1
jinja2-cli==0.7.0
ephem==4.1.5
jinja2-cli==0.8.2
nose==1.3.7
numpy==1.18.2
pytest==6.2.5
python-dateutil==2.8.1
pytz==2019.3
spacetrack==0.13.6
numpy==1.24.4
pytest==7.4.4
python-dateutil==2.8.2
pytz==2023.3
spacetrack==1.2.0
statistics==1.0.3.5
udatetime==0.0.16
ujson==2.0.2
udatetime==0.0.17
ujson==5.9.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name='pipe-satellite-data',
version=__import__('pipe_satellite_data').__version__,
version='3.1.0',
packages=find_packages(exclude=['test*.*', 'tests'])
)

0 comments on commit 5a311cb

Please sign in to comment.