Fixes and enhancements to sandbox and tests (#207)

.gitignore

@@ -27,6 +27,7 @@ share/python-wheels/
 *.egg
 MANIFEST
 */_version.py
+tmp/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -133,4 +134,5 @@ dmypy.json
 # dbt
 dbt_modules/
 logs/
+target/
 .user.yml

Makefile

@@ -9,8 +9,7 @@ clean:
 requirements:
 	python3 -m pip install \
 		-r requirements.txt \
-		-r requirements-test.txt \
-		-r sandbox/requirements.txt
+		-r requirements-test.txt
 .PHONY: requirements
 
 fix-fmt:
@@ -47,6 +46,9 @@ test:
 	python3 -m unittest tests
 .PHONY: test
 
+pre: fix check test
+.PHONY: pre
+
 dist-check: build
 	twine check dist/*
 .PHONY: dist-check

requirements-test.txt

@@ -5,5 +5,7 @@ black>=23.11.0
 isort>=5.12.0
 pylint>=3.0.2
 mypy>=1.7.1
+molot>=1.0.0,<1.1.0
+dbt-postgres>=1.7.4,<2.0.0
 types-requests
 types-PyYAML

sandbox/Dockerfile

@@ -2,15 +2,11 @@ FROM python:3.11-slim-bullseye
 
 WORKDIR /app
 
-COPY requirements.txt ./
+COPY --from=root requirements.txt ./
+COPY --from=root requirements-test.txt ./
 
-RUN python3 -m pip install -r requirements.txt
+RUN pip install -r requirements.txt -r requirements-test.txt
 
-COPY entrypoint.py ./
-COPY profiles.yml ./
-
-COPY models/ ./models/
-COPY seeds/ ./seeds/
-COPY dbt_project.yml ./
+WORKDIR /app/sandbox
 
 ENTRYPOINT ["python3", "entrypoint.py"]

sandbox/docker-compose.yml

@@ -41,7 +41,10 @@ services:
         condition: service_healthy
 
   app:
-    build: .
+    build:
+      context: .
+      additional_contexts:
+        root: ..
     command: init
     environment:
       - POSTGRES_USER=${POSTGRES_USER:-}
@@ -58,7 +61,7 @@ services:
     networks:
       - common
     volumes:
-      - ./target:/app/target
+      - .:/app/sandbox
     depends_on:
       postgres:
         condition: service_healthy

sandbox/models/schema.yml

@@ -59,7 +59,6 @@ models:
         description: Date (UTC) that the order was placed
 
       - name: status
-        description: '{{ doc("orders_status") }}'
         tests:
           - accepted_values:
               values: ['placed', 'shipped', 'completed', 'return_pending', 'returned']