Merge pull request #21 from uchicago-dsi/full-stack

Full stack

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly

.gitignore

@@ -169,3 +169,9 @@ cython_debug/
 
 # Cached OSMNX files
 cache/
+
+# pgdata
+pgdata/
+
+# data
+data

CONTRIBUTORS.md

@@ -0,0 +1,48 @@
+# Contributors
+
+We thank the Perpetual team for their invaluable guidance and feedback as well as the many software engineers, data scientists, and Data Clinic teams from the University of Chicago Data Science Institute who have contributed to this project.
+
+## Staff
+
+- Rahim Rasool, Data Scientist
+- Launa Greer, Software Engineer II
+
+## Students
+
+### Winter 2023
+
+- Izzy Allum
+- Sandra Mauro
+- Yushu Qiu
+- Ziyu Ren
+
+### Spring 2023
+
+- Yushu Qiu
+- Avery Schoen
+- Ekansh Trivedi
+- Ziyu Ren
+
+### Autumn 2023
+
+- Jessica Cibrian
+- Huanlin Dai
+- Yiran Hao (TA)
+- Sarah Walker
+- Yifan Wu
+
+### Winter 2024
+
+- Jessica Cibrian
+- Huanlin Dai
+- Lydia Lo
+- Sarah Walker (TA)
+- Yifan Wu
+
+### Spring 2024
+
+- Anuj Agarwal
+- John Christenson
+- Kaiwen Dong
+- Lydia Lo
+- Sarah Walker (TA)

Makefile

@@ -6,28 +6,22 @@ current_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
 current_abs_path := $(subst Makefile,,$(mkfile_path))
 
 # Project
-project_name := "perpetual"
+project_name := perpetual
 project_dir := "$(current_abs_path)"
+notebooks_dir := $(project_dir)notebooks
+data_dir := $(project_dir)data
 
-# Read environment variables from file
-include .env
-
-# Build Docker image and run containers in different modes
-build-only:
-	docker build -t $(project_name) -f Dockerfile $(current_abs_path)
-
-run-interactive:
-	docker build -t $(project_name) -f Dockerfile "$(current_abs_path)"
-	docker run -it \
-		-v "$(current_abs_path)/pipeline":/$(project_name)/pipeline \
-		-v "$(current_abs_path)/data:"/$(project_name)/data \
-		--env-file ".env" \
-		-t $(project_name) /bin/bash
+# Build Docker images and run containers in different modes
+run-pipeline:
+	cd $(current_abs_path) && \
+	. ./set_architecture.sh && \
+	docker compose up --build
 
 run-notebooks:
-	docker build -t $(project_name) -f Dockerfile "$(current_abs_path)"
-	docker run -v "$(current_abs_path)":/$(project_name) \
-		-p 8888:8888 -t $(project_name) \
-		jupyter lab --port=8888 --ip='*' --NotebookApp.token='' \
+	docker build -t $(project_name)-notebooks $(notebooks_dir)
+	docker run -it --rm -p 8888:8888 \
+		-v $(notebooks_dir):/$(project_name)/notebooks \
+		-v $(data_dir):/$(project_name)/data \
+		$(project_name)-notebooks jupyter lab \
+		--port=8888 --ip='*' --NotebookApp.token='' \
 		--NotebookApp.password='' --no-browser --allow-root
-