Merge pull request #4 from testdrivenio/updates

updates

Author: mjhea0

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: Continuous Integration and Delivery
 on: [push]
 
 env:
-  IMAGE: docker.pkg.github.com/$GITHUB_REPOSITORY/foo
+  IMAGE: docker.pkg.github.com/$(echo $GITHUB_REPOSITORY | tr '[A-Z]' '[a-z]')/summarizer
 
 jobs:
 
@@ -78,23 +78,23 @@ jobs:
             -p 5003:8765 \
             ${{ env.IMAGE }}-final:latest
       - name: Install requirements
-        run: docker exec fastapi-tdd pip install black flake8 isort pytest
+        run: docker exec fastapi-tdd pip install black==20.8b1 flake8===3.8.4 isort==5.6.4 pytest==6.2.0
       - name: Pytest
         run: docker exec fastapi-tdd python -m pytest .
       - name: Flake8
         run: docker exec fastapi-tdd python -m flake8 .
       - name: Black
         run: docker exec fastapi-tdd python -m black . --check
       - name: isort
-        run: docker exec fastapi-tdd /bin/sh -c "python -m isort ./*/*.py --check-only"
+        run: docker exec fastapi-tdd python -m isort . --check-only
 
   deploy:
     name: Deploy to Heroku
     runs-on: ubuntu-latest
     needs: [build, test]
     env:
-      HEROKU_APP_NAME: salty-fortress-93778
-      HEROKU_REGISTRY_IMAGE: registry.heroku.com/${HEROKU_APP_NAME}/foo
+      HEROKU_APP_NAME: secret-crag-02876
+      HEROKU_REGISTRY_IMAGE: registry.heroku.com/${HEROKU_APP_NAME}/summarizer
     steps:
       - name: Checkout master
         uses: actions/checkout@v2.3.4

.gitignore

@@ -1,4 +1,4 @@
 __pycache__
 env
-.coverage
 htmlcov
+.coverage

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
 
@@ -8,7 +8,7 @@ services:
     volumes:
       - ./project:/usr/src/app
     ports:
-      - 8002:8000
+      - 8004:8000
     environment:
       - ENVIRONMENT=dev
       - TESTING=0
@@ -17,7 +17,6 @@ services:
     depends_on:
       - web-db
 
-
   web-db:
     build:
       context: ./project/db

project/.dockerignore

@@ -2,5 +2,5 @@ env
 .dockerignore
 Dockerfile
 Dockerfile.prod
-.coverage
 htmlcov
+.coverage

project/Dockerfile

@@ -1,10 +1,10 @@
 # pull official base image
-FROM python:3.8.3-slim-buster
+FROM python:3.9.0-slim-buster
 
 # set working directory
 WORKDIR /usr/src/app
 
-# set environment varibles
+# set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
@@ -22,5 +22,9 @@ RUN pip install -r requirements-dev.txt
 # add app
 COPY . .
 
+# add entrypoint.sh
+COPY ./entrypoint.sh .
+RUN chmod +x /usr/src/app/entrypoint.sh
+
 # run entrypoint.sh
 ENTRYPOINT ["/usr/src/app/entrypoint.sh"]

project/Dockerfile.prod

@@ -3,7 +3,7 @@
 ###########
 
 # pull official base image
-FROM python:3.8.3-slim-buster as builder
+FROM python:3.8.6-slim-buster as builder
 
 # install system dependencies
 RUN apt-get update \
@@ -13,7 +13,7 @@ RUN apt-get update \
 # set work directory
 WORKDIR /usr/src/app
 
-# set environment varibles
+# set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
@@ -24,18 +24,18 @@ RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requir
 
 # lint
 COPY . /usr/src/app/
-RUN pip install black flake8 isort
+RUN pip install black==20.8b1 flake8===3.8.4 isort==5.6.4
 RUN flake8 .
 RUN black --exclude=migrations .
-RUN isort ./**/*.py
+RUN isort .
 
 
 #########
 # FINAL #
 #########
 
 # pull official base image
-FROM python:3.8.3-slim-buster
+FROM python:3.8.6-slim-buster
 
 # create directory for the app user
 RUN mkdir -p /home/app
@@ -65,6 +65,7 @@ COPY --from=builder /usr/src/app/wheels /wheels
 COPY --from=builder /usr/src/app/requirements.txt .
 RUN pip install --upgrade pip
 RUN pip install --no-cache /wheels/*
+RUN pip install "uvicorn[standard]==0.13.1"
 
 # add app
 COPY . .

project/app/api/crud.py

@@ -1,7 +1,4 @@
-# project/app/api/crud.py
-
-
-from typing import Union, List
+from typing import List, Union
 
 from app.models.pydantic import SummaryPayloadSchema
 from app.models.tortoise import TextSummary

project/app/api/ping.py

@@ -1,18 +1,14 @@
-# project/app/api/ping.py
-
-
 from fastapi import APIRouter, Depends
 
-from app.config import get_settings, Settings
-
+from app.config import Settings, get_settings
 
 router = APIRouter()
 
 
 @router.get("/ping")
 async def pong(settings: Settings = Depends(get_settings)):
     return {
-        "ping": "pong",
+        "ping": "pong!",
         "environment": settings.environment,
         "testing": settings.testing,
     }

project/app/api/summaries.py

@@ -1,18 +1,16 @@
-# project/app/api/summaries.py
-
-
 from typing import List
 
-from fastapi import APIRouter, HTTPException, Path, BackgroundTasks
+from fastapi import APIRouter, BackgroundTasks, HTTPException, Path
 
 from app.api import crud
-from app.models.pydantic import (
+from app.models.tortoise import SummarySchema
+from app.summarizer import generate_summary
+
+from app.models.pydantic import (  # isort:skip
     SummaryPayloadSchema,
     SummaryResponseSchema,
     SummaryUpdatePayloadSchema,
 )
-from app.models.tortoise import SummarySchema
-from app.summarizer import generate_summary
 
 
 router = APIRouter()

project/app/config.py

@@ -1,13 +1,10 @@
-# project/app/config.py
-
-
 import logging
 import os
 from functools import lru_cache
 
 from pydantic import AnyUrl, BaseSettings
 
-log = logging.getLogger(__name__)
+log = logging.getLogger("uvicorn")
 
 
 class Settings(BaseSettings):