Merge pull request #382 from deployment-gap-model-education-fund/dev

Merge `dev` into `main` for release `v2024.11.19`

Dockerfile

@@ -1,7 +1,7 @@
 # set base image (host OS)
 FROM python:3.10
 
-RUN apt-get update && apt-get install sqlite3
+RUN apt-get -y update && apt-get -y install sqlite3
 RUN apt-get -y install libgdal-dev
 
 RUN useradd -d /app/ dbcp

docker-compose.yaml

@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   app:
     build: .
@@ -7,7 +6,8 @@ services:
     environment:
       - API_KEY_GOOGLE_MAPS=${API_KEY_GOOGLE_MAPS} # get this value from our google account: https://console.cloud.google.com/google/maps-apis/credentials?project=dbcp-dev&supportedpurview=project
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     volumes:
       - ./src/dbcp:/app/dbcp:rw
       - ./notebooks:/app/notebooks:rw
@@ -24,3 +24,8 @@ services:
       - .env
     ports:
       - ${POSTGRES_PORT}:5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U youruser"]
+      interval: 5s
+      timeout: 5s
+      retries: 5

docs/data-mart/counties_long_format.md

@@ -61,7 +61,6 @@ This table is mostly a restructured version of counties_wide_format. It provides
 ||`n_tracts_local_to_area_income_ratio_less_than_high_school_islan`|Number of tracts with low ratios of local to regional income and low high school graduation rates (island territories only)|Justice40||
 ||`n_tracts_pm2_5_low_income`|Number of tracts with high particulate matter pollution and low income (excepting students)|Justice40||
 ||`n_tracts_population_loss_low_income`|Number of tracts with high predicted climate-driven population loss and low income (excepting students)|Justice40||
-||`n_tracts_risk_management_plan_proximity_low_income`|Number of tracts with close proximity to RMP sites and low income (excepting students)|Justice40||
 ||`n_tracts_superfund_proximity_low_income`|Number of tracts with close proximity to superfund sites and low income (excepting students)|Justice40||
 ||`n_tracts_traffic_low_income`|Number of tracts with high traffic exposure and low income (excepting students)|Justice40||
 ||`n_tracts_unemployment_and_low_high_school`|Number of tracts with high unemployment and low high school graduation rates|Justice40||

docs/data-mart/counties_wide_format.md

@@ -163,7 +163,6 @@ Fossil generation aggregates include coal, oil, and gas power plants.
 ||`n_tracts_local_to_area_income_ratio_less_than_high_school_islan`|Number of tracts with low ratios of local to regional income and low high school graduation rates (island territories only)|Justice40||
 ||`n_tracts_pm2_5_low_income`|Number of tracts with high particulate matter pollution and low income (excepting students)|Justice40||
 ||`n_tracts_population_loss_low_income`|Number of tracts with high predicted climate-driven population loss and low income (excepting students)|Justice40||
-||`n_tracts_risk_management_plan_proximity_low_income`|Number of tracts with close proximity to RMP sites and low income (excepting students)|Justice40||
 ||`n_tracts_superfund_proximity_low_income`|Number of tracts with close proximity to superfund sites and low income (excepting students)|Justice40||
 ||`n_tracts_traffic_low_income`|Number of tracts with high traffic exposure and low income (excepting students)|Justice40||
 ||`n_tracts_unemployment_and_low_high_school`|Number of tracts with high unemployment and low high school graduation rates|Justice40||