Skip to content

Commit

Permalink
Fixes in Makefile and Workflows (#108)
Browse files Browse the repository at this point in the history
* Makefile format

* Style

* Better on pr workflow

* Service instead docker setup
  • Loading branch information
dyakovri authored Apr 6, 2024
1 parent e894bf8 commit 8976081
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 11 deletions.
29 changes: 20 additions & 9 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
name: Python package
name: Python tests

on:
pull_request:


jobs:
test:
name: Unit tests
runs-on: ubuntu-latest
services:
postgres:
image: postgres:15
env:
POSTGRES_HOST_AUTH_METHOD: trust
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
-p 5432:5432
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up docker
uses: docker-practice/actions-setup-docker@master
- name: Run postgres
run: |
docker run -d -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name db-test postgres:15-alpine
- uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: "3.11"
- name: Install dependencies
run: |
python -m ensurepip
Expand All @@ -28,8 +33,10 @@ jobs:
run: |
DB_DSN=postgresql://postgres@localhost:5432/postgres alembic upgrade head
- name: Build coverage file
id: pytest
run: |
DB_DSN=postgresql://postgres@localhost:5432/postgres pytest --junitxml=pytest.xml --cov-report=term-missing:skip-covered --cov=calendar_backend tests/ | tee pytest-coverage.txt
exit ${PIPESTATUS[0]}
- name: Print report
if: always()
run: |
Expand All @@ -48,6 +55,10 @@ jobs:
remove-link-from-badge: false
junitxml-path: ./pytest.xml
junitxml-title: Summary
- name: Fail on pytest errors
if: steps.pytest.outcome == 'failure'
run: exit 1

linting:
runs-on: ubuntu-latest
steps:
Expand All @@ -60,7 +71,7 @@ jobs:
requirementsFiles: "requirements.txt requirements.dev.txt"
- uses: psf/black@stable
- name: Comment if linting failed
if: ${{ failure() }}
if: failure()
uses: thollander/actions-comment-pull-request@v2
with:
message: |
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ format:
source ./venv/bin/activate && autoflake -r --in-place --remove-all-unused-imports ./calendar_backend
source ./venv/bin/activate && isort ./calendar_backend
source ./venv/bin/activate && black ./calendar_backend
source ./venv/bin/activate && autoflake -r --in-place --remove-all-unused-imports ./tests
source ./venv/bin/activate && isort ./tests
source ./venv/bin/activate && black ./tests
source ./venv/bin/activate && autoflake -r --in-place --remove-all-unused-imports ./migrations
source ./venv/bin/activate && isort ./migrations
source ./venv/bin/activate && black ./migrations

db:
docker run -d -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name db-timetable_api postgres:15
Expand Down
2 changes: 1 addition & 1 deletion calendar_backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from functools import lru_cache

from auth_lib.fastapi import UnionAuthSettings
from pydantic import AnyHttpUrl, ConfigDict, DirectoryPath, Json, PostgresDsn
from pydantic import AnyHttpUrl, ConfigDict, DirectoryPath, PostgresDsn
from pydantic_settings import BaseSettings


Expand Down
1 change: 0 additions & 1 deletion migrations/versions/63263ee9e08e_fix_photo_paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"""

import sqlalchemy as sa
from alembic import op


Expand Down

0 comments on commit 8976081

Please sign in to comment.