Skip to content

Dj32 #7713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Feb 16, 2021
Merged

Dj32 #7713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1978f08
added gitignore .py.bak
auvipy May 2, 2019
d14680d
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy May 3, 2019
9391f37
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Sep 10, 2019
fc418fe
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Oct 24, 2019
b887b14
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Nov 6, 2019
49b774e
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Nov 7, 2019
bee0daf
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Nov 18, 2019
ad39555
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Jan 25, 2020
45c4ee8
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy May 5, 2020
c329977
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy May 12, 2020
e83840c
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy May 14, 2020
aa0a455
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy May 15, 2020
6c579e5
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Jul 29, 2020
fc9906d
Merge branch 'master' of https://github.com/encode/django-rest-framework
auvipy Nov 27, 2020
d309bb8
added django 3.2a1 to matrix
auvipy Feb 11, 2021
d6effd8
Merge branch 'master' of https://github.com/encode/django-rest-framew…
auvipy Feb 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
*.db
*~
.*
*.py.bak


/site/
/htmlcov/
Expand Down
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ matrix:
- { python: "3.6", env: DJANGO=2.2 }
- { python: "3.6", env: DJANGO=3.0 }
- { python: "3.6", env: DJANGO=3.1 }
- { python: "3.6", env: DJANGO=master }
- { python: "3.6", env: DJANGO=3.2 }

- { python: "3.7", env: DJANGO=2.2 }
- { python: "3.7", env: DJANGO=3.0 }
- { python: "3.7", env: DJANGO=3.1 }
- { python: "3.7", env: DJANGO=master }
- { python: "3.7", env: DJANGO=3.2 }

- { python: "3.8", env: DJANGO=3.0 }
- { python: "3.8", env: DJANGO=3.1 }
- { python: "3.8", env: DJANGO=3.2 }
- { python: "3.8", env: DJANGO=master }

- { python: "3.9", env: DJANGO=3.1 }
- { python: "3.9", env: DJANGO=3.2 }
- { python: "3.9", env: DJANGO=master }

- { python: "3.8", env: TOXENV=base }
Expand All @@ -38,6 +40,7 @@ matrix:

allow_failures:
- env: DJANGO=master
- env: DJANGO=3.2

install:
- pip install tox tox-travis
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ envlist =
{py35,py36,py37}-django22,
{py36,py37,py38}-django30,
{py36,py37,py38,py39}-django31,
{py36,py37,py38,py39}-djangomaster,
{py36,py37,py38,py39}-django32,
{py38,py39}-djangomaster,
base,dist,lint,docs,

[travis:env]
DJANGO =
2.2: django22
3.0: django30
3.1: django31
3.2: django32
master: djangomaster

[testenv]
Expand All @@ -23,6 +25,7 @@ deps =
django22: Django>=2.2,<3.0
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2a1,<4.0
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt
Expand Down