Skip to content

Commit

Permalink
Add drf 3.13 to matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
@shosca
shosca committed Apr 2, 2022
1 parent 4c27f8e commit 7f146f0
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 31 deletions.
43 changes: 34 additions & 9 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
push:
branches:
- master

pull_request:
workflow_dispatch:

jobs:
build:
Expand All @@ -25,26 +25,51 @@ jobs:
matrix:
container:
- image: python:3.6
toxenv: py36
toxenv: py36-sqla12
- image: python:3.6
toxenv: py36-sqla13
- image: python:3.6
toxenv: py36-sqla14

- image: python:3.7
toxenv: py37
toxenv: py37-sqla12
- image: python:3.7
toxenv: py37-sqla13
- image: python:3.7
toxenv: py37-sqla14

- image: python:3.8
toxenv: py38-sqla12
- image: python:3.8
toxenv: py38
toxenv: py38-sqla13
- image: python:3.8
toxenv: py38-sqla14

- image: python:3.9
toxenv: py39-sqla12
- image: python:3.9
toxenv: py39-sqla13
- image: python:3.9
toxenv: py39
toxenv: py39-sqla14

- image: python:3.10
toxenv: py310-sqla12
- image: python:3.10
toxenv: py310
toxenv: py310-sqla13
- image: python:3.10
toxenv: py310-sqla14

container:
image: ${{ matrix.container.image }}

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Install dependencies
run: |
apt-get update
apt-get install -y postgresql-client
pip install -r requirements.txt
pip install pre-commit tox tox-pyenv tox-factor coveralls
- name: Tox
run: |
tox -f ${{ matrix.container.toxenv }}
Expand All @@ -64,7 +89,7 @@ jobs:
steps:
- name: Coveralls Finished
run: |
pip3 install -U coveralls
pip3 install coveralls
coveralls --finish
env:
GITHUB_TOKEN: ${{ secrets.github_token }}
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ repos:
rev: 22.1.0
hooks:
- id: black
additional_dependencies: ["click==8.0.4"]
language_version: python3

- repo: https://github.com/asottile/pyupgrade
Expand Down
49 changes: 27 additions & 22 deletions tox.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,36 @@ skipsdist = true
envlist =
pypy36-{drf38,drf39,drf310}-{sqla12,sqla13,sqla14}-{dj11,dj20,dj21,dj22}-

py36-{ drf38}-{sqla12,sqla13,sqla14}-{dj11,dj20,dj21,dj22 }
py36-{ drf39}-{sqla12,sqla13,sqla14}-{dj11,dj20,dj21,dj22 }
py36-{drf310}-{sqla12,sqla13,sqla14}-{dj11,dj20,dj21,dj22 }
py36-{sqla12,sqla13,sqla14}-{ drf38}-{dj11,dj20,dj21,dj22 }
py36-{sqla12,sqla13,sqla14}-{ drf39}-{dj11,dj20,dj21,dj22 }
py36-{sqla12,sqla13,sqla14}-{drf310}-{dj11,dj20,dj21,dj22 }

py37-{ drf38}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22 }
py37-{ drf39}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22 }
py37-{drf310}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22,dj30 }
py37-{drf311}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22,dj30,dj31,dj32 }
py37-{drf312}-{sqla12,sqla13,sqla14}-{ dj22,dj30,dj31,dj32 }
py37-{sqla12,sqla13,sqla14}-{ drf38}-{ dj20,dj21,dj22 }
py37-{sqla12,sqla13,sqla14}-{ drf39}-{ dj20,dj21,dj22 }
py37-{sqla12,sqla13,sqla14}-{drf310}-{ dj20,dj21,dj22,dj30 }
py37-{sqla12,sqla13,sqla14}-{drf311}-{ dj20,dj21,dj22,dj30,dj31,dj32 }
py37-{sqla12,sqla13,sqla14}-{drf312}-{ dj22,dj30,dj31,dj32 }
py37-{sqla12,sqla13,sqla14}-{drf313}-{ dj22,dj30,dj31,dj32 }

py38-{ drf38}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22 }
py38-{ drf39}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22 }
py38-{drf310}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22,dj30 }
py38-{drf311}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22,dj30,dj31,dj32 }
py38-{drf312}-{sqla12,sqla13,sqla14}-{ dj22,dj30,dj31,dj32,dj40}
py38-{sqla12,sqla13,sqla14}-{ drf38}-{ dj20,dj21,dj22 }
py38-{sqla12,sqla13,sqla14}-{ drf39}-{ dj20,dj21,dj22 }
py38-{sqla12,sqla13,sqla14}-{drf310}-{ dj20,dj21,dj22,dj30 }
py38-{sqla12,sqla13,sqla14}-{drf311}-{ dj20,dj21,dj22,dj30,dj31,dj32 }
py38-{sqla12,sqla13,sqla14}-{drf312}-{ dj22,dj30,dj31,dj32,dj40}
py38-{sqla12,sqla13,sqla14}-{drf313}-{ dj22,dj30,dj31,dj32,dj40}

py39-{ drf38}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22 }
py39-{ drf39}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22 }
py39-{drf310}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22,dj30 }
py39-{drf311}-{sqla12,sqla13,sqla14}-{ dj20,dj21,dj22,dj30,dj31,dj32 }
py39-{drf312}-{sqla12,sqla13,sqla14}-{ dj22,dj30,dj31,dj32,dj40}
py39-{sqla12,sqla13,sqla14}-{ drf38}-{ dj20,dj21,dj22 }
py39-{sqla12,sqla13,sqla14}-{ drf39}-{ dj20,dj21,dj22 }
py39-{sqla12,sqla13,sqla14}-{drf310}-{ dj20,dj21,dj22,dj30 }
py39-{sqla12,sqla13,sqla14}-{drf311}-{ dj20,dj21,dj22,dj30,dj31,dj32 }
py39-{sqla12,sqla13,sqla14}-{drf312}-{ dj22,dj30,dj31,dj32,dj40}
py39-{sqla12,sqla13,sqla14}-{drf313}-{ dj22,dj30,dj31,dj32,dj40}

py310-{ drf39}-{sqla12,sqla13,sqla14}-{ dj21,dj22 }
py310-{drf310}-{sqla12,sqla13,sqla14}-{ dj21,dj22,dj30 }
py310-{drf311}-{sqla12,sqla13,sqla14}-{ dj21,dj22,dj30,dj31,dj32 }
py310-{drf312}-{sqla12,sqla13,sqla14}-{ dj22,dj30,dj31,dj32,dj40}
py310-{sqla12,sqla13,sqla14}-{ drf39}-{ dj21,dj22 }
py310-{sqla12,sqla13,sqla14}-{drf310}-{ dj21,dj22,dj30 }
py310-{sqla12,sqla13,sqla14}-{drf311}-{ dj21,dj22,dj30,dj31,dj32 }
py310-{sqla12,sqla13,sqla14}-{drf312}-{ dj22,dj30,dj31,dj32,dj40}
py310-{sqla12,sqla13,sqla14}-{drf313}-{ dj22,dj30,dj31,dj32,dj40}

[testenv]
passenv =
Expand Down Expand Up @@ -65,6 +69,7 @@ deps =
drf310: djangorestframework==3.10.*
drf311: djangorestframework==3.11.*
drf312: djangorestframework==3.12.*
drf313: djangorestframework==3.13.*
setenv =
COVERAGE_FLAGS = --cov-fail-under=100
whitelist_externals =
Expand Down

0 comments on commit 7f146f0

Please sign in to comment.