Merge pull request #173 from rcpch/prerelease

Merge Prerelease into Live

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.1
+current_version = 3.0.3
 tag = True
 commit = True
 

.github/workflows/prerelease_rcpch-dgc-server-prerelease.yml

@@ -0,0 +1,38 @@
+# Docs for the Azure Web Apps Deploy action: https://go.microsoft.com/fwlink/?linkid=2134798
+# More GitHub Actions for Azure: https://go.microsoft.com/fwlink/?linkid=2135048
+
+name: Azure App Service - rcpch-dgc-server-prerelease(Production), Build and deploy Python app
+
+on:
+  push:
+    branches:
+      - prerelease
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    # checkout the repo
+    - name: 'Checkout Github Action'
+      uses: actions/checkout@master
+
+
+    - name: Set up Python version
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.8'
+
+    - name: Build using AppService-Build
+      uses: azure/appservice-build@v2
+      with:
+        platform: python
+        platform-version: '3.8'
+
+    - name: Run Azure webapp deploy action using publish profile credentials
+      uses: azure/webapps-deploy@v2
+      with:
+        app-name: rcpch-dgc-server-prerelease
+        slot-name: Production
+        publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_A25B845A90A94C7786D88F863BBF679D }}
+

.python-version

@@ -1 +1 @@
-fastapi-refactor
+live-dgc-server

main.py

@@ -11,7 +11,7 @@
 from routers import uk_who, turners, trisomy_21
 
 ### API VERSION ###
-version='3.0.1'  # this is set by bump version
+version='3.0.3'  # this is set by bump version
 API_SEMANTIC_VERSION = version  
 
 
@@ -33,19 +33,15 @@ class Settings(BaseSettings):
     allow_headers=["*"],
 )
 
-
-
 # include routers for each type of endpoint
 app.include_router(uk_who)
 app.include_router(turners)
 app.include_router(trisomy_21)
 
-
 @app.get("/")
 def read_root():
     return {"200 OK"}
 
-
 def custom_openapi():
     if app.openapi_schema:
         print(openapi_schema)

requirements/common-requirements.txt

@@ -1,5 +1,5 @@
 # standard dependencies
-typing
+# typing # this may be causing build errors in Azure. Typing is built in after Python 3.5
 
 # third party dependencies
 fastapi

s/uvicorn-start-prod

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# runs the API server in production mode
+# using gunicorn to manage 4 uvicorn workers
+# used by Azure on deploy command
+
+gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app