Merge pull request #6 from ServerCrow/renovate/pyyaml-6.x

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Lint, Test, Tag, Build and Deploy DEV
+name: Lint, Test, Tag, Build and Deploy
 
 on:
   push:
@@ -6,13 +6,16 @@ on:
       - dev
       - master
     paths-ignore:
-      - "**/.github/**"
       - "**/.gitignore"
       - "**/.vscode/**"
       - "**/README.md"
       - "**/CHANGELOG.md"
       - "**/docs/**"
   workflow_dispatch:
+  pull_request:
+    branches:
+      - master
+      - dev
 
 env:
   REGISTRY: ghcr.io
@@ -25,11 +28,11 @@ jobs:
     - uses: actions/checkout@v4
     - uses: psf/black@stable
       with:
-        options: "-l 100 --exclude '/.venv/|alembic/|/__init__.py'"
+        options: "-l 100 --exclude '/.venv/|/__init__.py'"
     - uses: creyD/autoflake_action@master
       with:
         no_commit: True
-        options: --in-place --remove-all-unused-imports -r --exclude **/__init__.py,**/db/models.py,
+        options: --in-place --remove-all-unused-imports -r --exclude **/__init__.py
     - uses: stefanzweifel/git-auto-commit-action@v5
       with:
         commit_message: Adjusted files for isort & autopep
@@ -52,6 +55,7 @@ jobs:
 
   tag:
     needs: test
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     permissions:
       contents: write # for the tags
@@ -78,7 +82,7 @@ jobs:
           major_pattern: "breaking:"
           minor_pattern: "feat:"
           enable_prerelease_mode: false
-          version_format: "${major}.${minor}.${patch}-rc${increment}"
+          version_format: "${major}.${minor}.${patch}"
 
       - name: Create Tag
         run: git tag ${{ steps.git_version.outputs.version }}
@@ -87,6 +91,7 @@ jobs:
         run: git push origin ${{ steps.git_version.outputs.version }}
 
   build_and_push:
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     permissions: write-all
     needs: tag
@@ -106,7 +111,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-${{ github.ref_name }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: latest
 
       - name: Build and push Docker image
@@ -115,7 +120,7 @@ jobs:
           context: .
           file: ./Dockerfile
           build-args: |
-            VERSION=${{ needs.tag.outputs.version }}-${{ github.ref_name }}
+            VERSION=${{ needs.tag.outputs.version }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.vscode/launch.json

@@ -12,24 +12,6 @@
       "env": {
         "PYDEVD_DISABLE_FILE_VALIDATION": "1"
       }
-    },
-    {
-      "name": "Migrate",
-      "type": "debugpy",
-      "request": "launch",
-      "module": "alembic",
-      "args": ["upgrade", "head"],
-      "jinja": true,
-      "justMyCode": true
-    },
-    {
-      "name": "Make Migrations",
-      "type": "debugpy",
-      "request": "launch",
-      "module": "alembic",
-      "args": ["revision", "--autogenerate"],
-      "jinja": true,
-      "justMyCode": true
     }
   ]
 }

app/main.py

@@ -1,9 +1,7 @@
 import os
-from fastapi import APIRouter
+from fastapi import APIRouter, FastAPI, Response
-from fastapi import Response
 from creyPY.fastapi.app import generate_unique_id
 from dotenv import load_dotenv
-from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
 load_dotenv()

app/test_main.py

@@ -1,4 +1,5 @@
 from creyPY.fastapi.testing import GenericClient
+
 from .main import app
 
 

renovate.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    ":semanticCommitTypeAll(feat)"
+  ]
+}

requirements.txt

@@ -1,12 +1,12 @@
-certifi==2023.11.17 # Testing
+certifi==2024.7.4 # Testing
 iniconfig==2.0.0 # PyTest Testing
 packaging==23.2 # PyTest Testing
 pluggy==1.3.0 # PyTest Testing
-pytest==7.4.3 # PyTest Testing
+pytest==7.4.4 # PyTest Testing
 
 click==8.1.7 # Uvicorn
-httptools==0.6.1 # Uvicorn
+httptools==0.6.4 # Uvicorn
-pyyaml==6.0.1 # Uvicorn
+pyyaml==6.0.2 # Uvicorn
 uvicorn==0.27.0.post1 # Uvicorn
 uvloop==0.19.0 # Uvicorn
 watchfiles==0.21.0 # Uvicorn