Skip to content

Commit

Permalink
Fix Django CI workflow
Browse files Browse the repository at this point in the history
Add mysqlclient to requirements.txt

Remove mysql from django CI workflow

Fix python 3 version number in django workflow

See actions/setup-python#160

Don't drop DB in CI workflow

Remove mysqlclient and mysql from django CI workflow
  • Loading branch information
davnov015 committed Jun 12, 2024
1 parent 956557d commit 283f09b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
24 changes: 4 additions & 20 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.8, 3.9, 3.10]
db: [postgres, mysql]
python-version: [3.8, 3.9, '3.10']
db: [postgres]
include:
- db: postgres
db_port: 5432
- db: mysql
db_port: 3306
services:
postgres:
image: postgres:16
Expand All @@ -34,20 +32,6 @@ jobs:
--health-timeout 5s
--health-retries 5

mysql:
image: mysql:8
ports:
- 3306:3306
env:
MYSQL_ROOT_PASSWORD: SpYkxYy1dMmo7Bk
MYSQL_USER: permagate
MYSQL_PASSWORD: SpYkxYy1dMmo7Bk
options:
--health-cmd "mysqladmin ping"
--health-interval 10s
--health-timeout 5s
--health-retries 3

steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -58,8 +42,8 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Run Tests
env:
DATABASE_URL: ${{ matrix.db }}://permagate:SpYkxYy1dMmo7Bk@127.0.0.1:${{ matrix.db_port }}/permagate
- name: Run Tests
run: |
python manage.py test
python manage.py test --keepdb
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# PermaGate

-----
[![Django CI](https://github.com/davnov015/django-permagate/actions/workflows/django.yml/badge.svg)](https://github.com/davnov015/django-permagate/actions/workflows/django.yml)

PermaGate is a Django permissions system which offers hierarchical permissions that can be
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Django==4.2.3
django-environ==0.10.0
psycopg2==2.9.6
psycopg2==2.9.6

0 comments on commit 283f09b

Please sign in to comment.