Skip to content

Commit

Permalink
Update test matrix, include Django 4.0b1
Browse files Browse the repository at this point in the history
  • Loading branch information
vdboor committed Nov 18, 2021
1 parent b30aee1 commit cca5268
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 34 deletions.
31 changes: 0 additions & 31 deletions .github/workflows/django.yml

This file was deleted.

74 changes: 74 additions & 0 deletions .github/workflows/tests.yaml
@@ -0,0 +1,74 @@
name: CI Testing
on:
pull_request:
branches:
- master
push:
branches:
- master

jobs:
test:
name: "Python ${{ matrix.python }} Django ${{ matrix.django }}"
runs-on: ubuntu-latest
strategy:
# max-parallel: 8 # default is max available
fail-fast: false
matrix:
include:
# Django 2.2
- django: "2.2"
python: "3.6"
- django: "2.2"
python: "3.7"
- django: "2.2"
python: "3.8"
- django: "2.2"
python: "3.9"
# Django 3.1
- django: "3.1"
python: "3.6"
- django: "3.1"
python: "3.7"
- django: "3.1"
python: "3.8"
- django: "3.1"
python: "3.9"
# Django 3.2
- django: "3.2"
python: "3.6"
- django: "3.2"
python: "3.7"
- django: "3.2"
python: "3.8"
- django: "3.2"
python: "3.9"
- django: "3.2"
python: "3.10"
# Django 4.0
- django: "4.0b1"
python: "3.10"

steps:
#- name: Install gettext
# run: sudo apt-get install -y gettext

- name: Checkout code
uses: actions/checkout@v2

- name: Setup Python ${{ matrix.python }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}

- name: Install Packages
run: |
python -m pip install -U pip
python -m pip install "Django~=${{ matrix.django }}" codecov -e .[tests]
- name: Run Tests
run: |
echo "Python ${{ matrix.python }} / Django ${{ matrix.django }}"
coverage run --rcfile=.coveragerc runtests.py
codecov
continue-on-error: ${{ contains(matrix.django, '4.0') }}
9 changes: 6 additions & 3 deletions tox.ini
Expand Up @@ -2,8 +2,9 @@
envlist=
py36-django{22,30,31},
py37-django{22,30,31},
py38-django{22,30,31},
# py33-django-dev,
py38-django{22,30,31,32},
py39-django{40},
# py39-django-dev,
coverage,
docs,

Expand All @@ -12,6 +13,8 @@ deps = django-polymorphic
django22: Django >= 2.2,<2.3
django30: Django >= 3.0,<3.1
django31: Django >= 3.1,<3.2
django32: Django >= 3.1,<3.2
django40: Django==4.0b1
django-dev: https://github.com/django/django/tarball/master
commands=
python runtests.py
Expand All @@ -27,7 +30,7 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
[testenv:coverage]
basepython=python3.6
deps=
django==3.0
django==3.2
coverage==4.4.1
commands=
coverage erase
Expand Down

0 comments on commit cca5268

Please sign in to comment.