diff --git a/Dockerfile b/Dockerfile index 5a706c9..a747e91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get purge -y curl git build-essential \ FROM install AS app-image -ENV PYTHONPATH=/home/code/ PYTHONHASHSEED=0 +ENV PYTHONPATH=/home/code/ PYTHONHASHSEED=0 PYTHONASYNCIODEBUG=1 COPY tests/ tests/ COPY app/ app/ diff --git a/Makefile b/Makefile index 1035990..ae5ecb3 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ docker-create-db-migration: ## Create new alembic database migration aka databa .PHONY: docker-test docker-test: ## Run project tests - docker compose -f compose.yml -f test-compose.yml run --rm app pytest tests --durations=0 + docker compose -f compose.yml -f test-compose.yml run --rm app pytest tests --durations=0 -vv .PHONY: docker-test-snapshot docker-test-snapshot: ## Run project tests with inline snapshot @@ -51,16 +51,16 @@ slim-build: ## with power of docker-slim build smaller and safer images .PHONY: docker-feed-database docker-feed-database: ## create database objects and insert data - docker compose exec db psql devdb user -f /home/gx/code/shakespeare_work.sql | true - docker compose exec db psql devdb user -f /home/gx/code/shakespeare_chapter.sql | true - docker compose exec db psql devdb user -f /home/gx/code/shakespeare_wordform.sql | true - docker compose exec db psql devdb user -f /home/gx/code/shakespeare_character.sql | true - docker compose exec db psql devdb user -f /home/gx/code/shakespeare_paragraph.sql | true - docker compose exec db psql devdb user -f /home/gx/code/shakespeare_character_work.sql + docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_work.sql | true + docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_chapter.sql | true + docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_wordform.sql | true + docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_character.sql | true + docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_paragraph.sql | true + docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_character_work.sql .PHONY: model-generate model-generate: ## generate sqlalchemy models from database - poetry run sqlacodegen --generator declarative postgresql://user:secret@0.0.0.0/devdb --outfile models.py --schemas shakespeare + poetry run sqlacodegen --generator declarative postgresql://devdb:secret@0.0.0.0/devdb --outfile models.py --schemas shakespeare --options nobidi .PHONY: docker-up-granian docker-up-granian: ## Run project with compose and granian diff --git a/alembic/versions/20240102_2012_68cd4c3a0af0_.py b/alembic/versions/20241122_1212_0c69050b5a3e_init.py similarity index 98% rename from alembic/versions/20240102_2012_68cd4c3a0af0_.py rename to alembic/versions/20241122_1212_0c69050b5a3e_init.py index 69a2a83..2b89a5c 100644 --- a/alembic/versions/20240102_2012_68cd4c3a0af0_.py +++ b/alembic/versions/20241122_1212_0c69050b5a3e_init.py @@ -1,17 +1,17 @@ -""" +"""init -Revision ID: 68cd4c3a0af0 +Revision ID: 0c69050b5a3e Revises: -Create Date: 2024-01-02 20:12:46.214651 +Create Date: 2024-11-22 12:12:12.343675 """ from alembic import op import sqlalchemy as sa - +from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. -revision = "68cd4c3a0af0" +revision = "0c69050b5a3e" down_revision = None branch_labels = None depends_on = None