Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Commit

Permalink
Merge pull request #126 from pangeo-forge/use-pfr-0.5
Browse files Browse the repository at this point in the history
Use pangeo-forge-runner==0.5
  • Loading branch information
cisaacstern authored Sep 15, 2022
2 parents 7fbbf3e + 0f40ad2 commit 2444970
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
&& curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | tee /usr/share/keyrings/cloud.google.gpg \
&& apt-get update && apt-get -y install google-cloud-cli

# TODO: remove git + gcc, and revert python3.9-dev -> python3.9 above
# Only needed for now because installing unrealeased deps from github
RUN apt-get update && apt-get -y install git gcc
COPY requirements.txt ./
RUN python3.9 -m pip install -r requirements.txt

Expand All @@ -48,6 +45,7 @@ WORKDIR /opt/app
# so even though we have this in the repo (for development & testing convenience), we actually .dockerignore
# it, and then clone it from github at build time (otherwise we don't actually get these contents on heroku)
# After cloning, reset to a specific commit, so we don't end up with the wrong contents.
RUN apt-get update && apt-get -y install git
RUN git clone -b main --single-branch https://github.com/pangeo-forge/dataflow-status-monitoring \
&& cd dataflow-status-monitoring \
&& git reset --hard c72a594b2aea5db45d6295fadd801673bee9746f \
Expand Down
7 changes: 3 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ psycopg2-binary==2.9.3

# these will eventually move out of the app container, and instead be
# installed within the docker sibling container used for recipe handling
# pangeo-forge-runner==0.5 -> use this once released
git+https://github.com/yuvipanda/pangeo-forge-runner@main
gcsfs
s3fs
pangeo-forge-runner==0.5
gcsfs==2022.8.2
s3fs==2022.8.2

# for `/repr/xarray/` route
zarr
Expand Down
5 changes: 1 addition & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ install_requires =
gidgethub >= 5.1.0
sqlmodel >= 0.0.7 # https://github.com/tiangolo/sqlmodel/issues/315#issuecomment-1229239354
psycopg2-binary # for postgres
# note: production gets `pangeo-forge-runner` from
# git+https://github.com/yuvipanda/pangeo-forge-runner@main,
# but i'm not sure how to use github deps in setup.cfg
pangeo-forge-runner == 0.4
pangeo-forge-runner == 0.5

[options.extras_require]
dev =
Expand Down

0 comments on commit 2444970

Please sign in to comment.