Skip to content

Commit

Permalink
Merge pull request #656 from CTPUG/feature/update_workflow
Browse files Browse the repository at this point in the history 
Feature/update workflow
  • Loading branch information
@stefanor
stefanor committed Jan 19, 2023
2 parents dd9b45e + 67806fc commit 8abed9f
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 27 deletions.
70 changes: 44 additions & 26 deletions .github/workflows/django.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,43 @@ jobs:
# Maps tcp port 5432 on service container to the host
- 5432:5432

name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == '4.1.0' || matrix.django-version == 'main' }} )
name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == 'main' }} )
strategy:
max-parallel: 4
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
django-version: ['2.2.0', '3.0.0', '3.1.0', '3.2.0', '4.0.0', '4.1.0', 'main']
exclude:
- django-version: '4.0.0'
python-version: '3.6'
- django-version: '4.0.0'
python-version: '3.7'
- django-version: '4.1.0'
python-version: '3.6'
- django-version: '4.1.0'
python-version: '3.7'
- django-version: 'main'
python-version: '3.6'
- django-version: 'main'
python-version: '3.7'
- django-version: 'main'
python-version: '3.8'
- django-version: 'main'
python-version: '3.9'
- django-version: '2.2.0'
python-version: '3.10'
- django-version: '2.2.0'
python-version: '3.11'
- django-version: '3.0.0'
python-version: '3.11'
- django-version: '3.1.0'
python-version: '3.11'
- django-version: '3.2.0'
python-version: '3.11'
- django-version: '4.0.0'
python-version: '3.11'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == '4.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == 'main' }}
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r requirements-dev.txt
Expand All @@ -74,7 +82,7 @@ jobs:
pip install 'https://github.com/django/django/archive/main.tar.gz'
if: matrix.django-version == 'main'
- name: Run Tests
continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == '4.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == 'main' }}
env:
TESTDB: postgres
run: |
Expand All @@ -85,35 +93,43 @@ jobs:

runs-on: ubuntu-latest

name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == '4.1.0' || matrix.django-version == 'main'}} )
name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == 'main'}} )
strategy:
max-parallel: 4
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10','3.11']
django-version: ['2.2.0', '3.0.0', '3.1.0', '3.2.0', '4.0.0', '4.1.0', 'main']
exclude:
- django-version: '4.0.0'
python-version: '3.6'
- django-version: '4.0.0'
python-version: '3.7'
- django-version: '4.1.0'
python-version: '3.6'
- django-version: '4.1.0'
python-version: '3.7'
- django-version: 'main'
python-version: '3.6'
- django-version: 'main'
python-version: '3.7'
- django-version: 'main'
python-version: '3.8'
- django-version: 'main'
python-version: '3.9'
- django-version: '2.2.0'
python-version: '3.10'
- django-version: '2.2.0'
python-version: '3.11'
- django-version: '3.0.0'
python-version: '3.11'
- django-version: '3.1.0'
python-version: '3.11'
- django-version: '3.2.0'
python-version: '3.11'
- django-version: '4.0.0'
python-version: '3.11'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == '4.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == 'main' }}
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r requirements-dev.txt
Expand All @@ -127,7 +143,7 @@ jobs:
pip install 'https://github.com/django/django/archive/main.tar.gz'
if: matrix.django-version == 'main'
- name: Run Tests
continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == '4.1.0' || matrix.django-version == 'main' }}
continue-on-error: ${{ matrix.django-version == 'main' }}
run: |
export PYTHONWARNINGS=always
coverage run --source='wafer' manage.py test && coverage report --skip-covered
Expand All @@ -136,9 +152,11 @@ jobs:
runs-on: ubuntu-latest
name: Compile Translations
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Install Python Dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'django-select2',
'djangorestframework',
'drf-extensions>=0.5.0',
'icalendar>=4.0',
'icalendar>=4.0,<5.0',
'jsonfield',
'markdown>=2.5',
'pillow',
Expand Down

0 comments on commit 8abed9f

Please sign in to comment.