updates

mjhea0 · mjhea0 · commit 04cea5638975 · 2021-12-28T07:15:18.000-06:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,8 +11,10 @@ jobs:
     name: Build Docker Image
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout master
-        uses: actions/checkout@v2.3.4
+      - name: Checkout
+        uses: actions/checkout@v2.4.0
+        with:
+          ref: main
       - name: Log in to GitHub Packages
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin docker.pkg.github.com
         env:
@@ -44,8 +46,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - name: Checkout master
-        uses: actions/checkout@v2.3.4
+      - name: Checkout
+        uses: actions/checkout@v2.4.0
+        with:
+          ref: main
       - name: Log in to GitHub Packages
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin docker.pkg.github.com
         env:
@@ -74,11 +78,12 @@ jobs:
             --name fastapi-tdd \
             -e PORT=8765 \
             -e ENVIRONMENT=dev \
+            -e DATABASE_URL=sqlite://sqlite.db \
             -e DATABASE_TEST_URL=sqlite://sqlite.db \
             -p 5003:8765 \
             ${{ env.IMAGE }}-final:latest
       - name: Install requirements
-        run: docker exec fastapi-tdd pip install black==21.6b0 flake8==3.9.2 isort==5.9.1 pytest==6.2.4
+        run: docker exec fastapi-tdd pip install black==21.12b0 flake8==4.0.1 isort==5.10.1 pytest==6.2.5
       - name: Pytest
         run: docker exec fastapi-tdd python -m pytest .
       - name: Flake8
@@ -93,11 +98,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, test]
     env:
-      HEROKU_APP_NAME: thawing-beach-87010
+      HEROKU_APP_NAME: sleepy-thicket-77414
       HEROKU_REGISTRY_IMAGE: registry.heroku.com/${HEROKU_APP_NAME}/summarizer
     steps:
-      - name: Checkout master
-        uses: actions/checkout@v2.3.4
+      - name: Checkout
+        uses: actions/checkout@v2.4.0
+        with:
+          ref: main
       - name: Log in to GitHub Packages
         run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin docker.pkg.github.com
         env:
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Test-Driven Development with FastAPI and Docker
 
-![Continuous Integration and Delivery](https://github.com/testdrivenio/fastapi-tdd-docker/workflows/Continuous%20Integration%20and%20Delivery/badge.svg?branch=master)
+![Continuous Integration and Delivery](https://github.com/testdrivenio/fastapi-tdd-docker/workflows/Continuous%20Integration%20and%20Delivery/badge.svg?branch=main)
 
 https://testdriven.io/courses/tdd-fastapi/
diff --git a/project/Dockerfile b/project/Dockerfile
@@ -1,5 +1,5 @@
 # pull official base image
-FROM python:3.9.6-slim-buster
+FROM python:3.10.1-slim-buster
 
 # set working directory
 WORKDIR /usr/src/app
diff --git a/project/Dockerfile.prod b/project/Dockerfile.prod
@@ -3,7 +3,7 @@
 ###########
 
 # pull official base image
-FROM python:3.8.11-slim-buster as builder
+FROM python:3.10.1-slim-buster as builder
 
 # install system dependencies
 RUN apt-get update \
@@ -24,7 +24,7 @@ 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==21.6b0 flake8==3.9.2 isort==5.9.1
+RUN pip install black==21.12b0 flake8==4.0.1 isort==5.10.1
 RUN flake8 .
 RUN black --exclude=migrations .
 RUN isort .
@@ -35,7 +35,7 @@ RUN isort .
 #########
 
 # pull official base image
-FROM python:3.8.11-slim-buster
+FROM python:3.10.1-slim-buster
 
 # create directory for the app user
 RUN mkdir -p /home/app
@@ -65,7 +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.14.0"
+RUN pip install "uvicorn[standard]==0.16.0"
 
 # add app
 COPY . .
diff --git a/project/aerich.ini b/project/aerich.ini
diff --git a/project/app/api/crud.py b/project/app/api/crud.py
@@ -1,6 +1,3 @@
-# project/app/api/crud.py
-
-
 from typing import List, Union
 
 from app.models.pydantic import SummaryPayloadSchema
@@ -16,7 +13,7 @@ async def post(payload: SummaryPayloadSchema) -> int:
 async def get(id: int) -> Union[dict, None]:
     summary = await TextSummary.filter(id=id).first().values()
     if summary:
-        return summary[0]
+        return summary
     return None
 
 
@@ -36,5 +33,5 @@ async def put(id: int, payload: SummaryPayloadSchema) -> Union[dict, None]:
     )
     if summary:
         updated_summary = await TextSummary.filter(id=id).first().values()
-        return updated_summary[0]
+        return updated_summary
     return None
diff --git a/project/app/api/ping.py b/project/app/api/ping.py
@@ -1,6 +1,3 @@
-# project/app/api/ping.py
-
-
 from fastapi import APIRouter, Depends
 
 from app.config import Settings, get_settings
diff --git a/project/app/api/summaries.py b/project/app/api/summaries.py
@@ -1,6 +1,3 @@
-# project/app/api/summaries.py
-
-
 from typing import List
 
 from fastapi import APIRouter, BackgroundTasks, HTTPException, Path
diff --git a/project/app/config.py b/project/app/config.py
@@ -1,6 +1,3 @@
-# project/app/config.py
-
-
 import logging
 import os
 from functools import lru_cache
diff --git a/project/app/db.py b/project/app/db.py
@@ -1,6 +1,3 @@
-# project/app/db.py
-
-
 import logging
 import os
 
diff --git a/project/app/main.py b/project/app/main.py
@@ -1,6 +1,3 @@
-# project/app/main.py
-
-
 import logging
 
 from fastapi import FastAPI
diff --git a/project/app/models/pydantic.py b/project/app/models/pydantic.py
@@ -1,6 +1,3 @@
-# project/app/models/pydantic.py
-
-
 from pydantic import AnyHttpUrl, BaseModel
 
 
diff --git a/project/app/models/tortoise.py b/project/app/models/tortoise.py
@@ -1,6 +1,3 @@
-# project/app/models/tortoise.py
-
-
 from tortoise import fields, models
 from tortoise.contrib.pydantic import pydantic_model_creator
 
diff --git a/project/app/summarizer.py b/project/app/summarizer.py
@@ -1,6 +1,3 @@
-# project/app/summarizer.py
-
-
 import nltk
 from newspaper import Article
 
diff --git a/project/db/Dockerfile b/project/db/Dockerfile
@@ -1,5 +1,5 @@
 # pull official base image
-FROM postgres:13-alpine
+FROM postgres:14-alpine
 
 # run create.sql on init
 ADD create.sql /docker-entrypoint-initdb.d
diff --git a/project/migrations/models/0_20211227001140_init.sql b/project/migrations/models/0_20211227001140_init.sql
diff --git a/project/pyproject.toml b/project/pyproject.toml
@@ -0,0 +1,4 @@
+[tool.aerich]
+tortoise_orm = "app.db.TORTOISE_ORM"
+location = "./migrations"
+src_folder = "./."
diff --git a/project/requirements-dev.txt b/project/requirements-dev.txt
@@ -1,8 +1,8 @@
-black==21.6b0
-flake8==3.9.2
-isort==5.9.1
-pytest==6.2.4
-pytest-cov==2.12.1
-pytest-xdist==2.3.0
+black==21.12b0
+flake8==4.0.1
+isort==5.10.1
+pytest==6.2.5
+pytest-cov==3.0.0
+pytest-xdist==2.5.0
 
 -r requirements.txt
diff --git a/project/requirements.txt b/project/requirements.txt
@@ -1,8 +1,8 @@
-aerich==0.5.3
-asyncpg==0.23.0
-fastapi==0.65.3
+aerich==0.6.1
+asyncpg==0.25.0
+fastapi==0.70.1
 gunicorn==20.1.0
 newspaper3k==0.2.8
-requests==2.25.1
-tortoise-orm==0.17.4
-uvicorn==0.14.0
+requests==2.26.0
+tortoise-orm==0.17.8
+uvicorn==0.16.0
diff --git a/project/tests/test_ping.py b/project/tests/test_ping.py
@@ -1,6 +1,3 @@
-# project/tests/test_ping.py
-
-
 def test_ping(test_app):
     response = test_app.get("/ping")
     assert response.status_code == 200
diff --git a/project/tests/test_summaries_unit.py b/project/tests/test_summaries_unit.py
@@ -1,6 +1,3 @@
-# project/tests/test_summaries_unit.py
-
-
 import json
 from datetime import datetime
 
