From b9a1f5a8cc860a0af106b5edeb0a3c9de95d26fa Mon Sep 17 00:00:00 2001 From: Michael Dales Date: Wed, 7 May 2025 14:46:06 +0100 Subject: [PATCH 1/2] Add feedback from Simon Tarr --- Dockerfile | 1 + README.md | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3689b0..867f1c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,7 @@ RUN mkdir -p /data # the Python virtualenv is set, but in Docker we don't # use a virtualenv, as docker *is* a virtualenv ENV VIRTUAL_ENV=/ +ENV PYTHONPATH=/root/star RUN python3 -m pytest ./tests RUN python3 -m pylint prepare_layers prepare_species utils tests diff --git a/README.md b/README.md index 42b49a0..dbe9873 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,27 @@ See [method.md](method.md) for a description of the methodology, or `scripts/run # Running the pipeline +## Checking out the code + +This repository uses submodules, so once you have cloned it, you need to fetch the submodules: + +```shell +$ git clone https://github.com/quantifyearth/star.git +$ cd star +$ git submodule update --init --recursive +``` + +## Running the pipeline + The easiest way to get started will be to run `scripts/run.sh` under a linux environment. -## Running on Ubuntu +### Running on Ubuntu The following extra utilities will need to be installed: * [Reclaimer](https://github.com/quantifyearth/reclaimer/) - a utility for downloading data from various primary sources. -## Running in Docker +### Running in Docker There is included a docker file, which is based on the GDAL container image, which is set up to install everything ready to use. You can build that using: From 8ec806132354cd583e49e84c023f0a9a3da8de05 Mon Sep 17 00:00:00 2001 From: Michael Dales Date: Wed, 7 May 2025 14:52:22 +0100 Subject: [PATCH 2/2] Bump CI GDAL package --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index db7294b..0746930 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -12,7 +12,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: ghcr.io/osgeo/gdal:ubuntu-small-3.10.2 + container: ghcr.io/osgeo/gdal:ubuntu-small-3.10.3 strategy: fail-fast: false matrix: