encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-11-04 09:57:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3933 from carltongibson/drop-django-17

Browse Source 
Drop EOL Django 1.7
This commit is contained in:
Xavier Ordoquy 2016-02-15 19:59:00 +01:00
commit 79dad012b0
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -15,10 +15,6 @@ env:
- TOX_ENV=py33-django18 - TOX_ENV=py33-django18
- TOX_ENV=py32-django18 - TOX_ENV=py32-django18
- TOX_ENV=py27-django18 - TOX_ENV=py27-django18
- TOX_ENV=py34-django17
- TOX_ENV=py33-django17
- TOX_ENV=py32-django17
- TOX_ENV=py27-django17
matrix: matrix:
fast_finish: true fast_finish: true

6
docs/topics/release-notes.md
View File

@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`:
## 3.3.x series ## 3.3.x series
### 3.4
**Unreleased**
* Dropped support for EOL Django 1.7 ([#3933][gh3933])
### 3.3.2 ### 3.3.2
**Date**: [14th December 2015][3.3.2-milestone]. **Date**: [14th December 2015][3.3.2-milestone].

3
tox.ini
View File

@ -4,7 +4,7 @@ addopts=--tb=short
[tox] [tox]
envlist = envlist =
py27-{lint,docs}, py27-{lint,docs},
{py27,py32,py33,py34}-django{17,18}, {py27,py32,py33,py34}-django18,
{py27,py34,py35}-django{19} {py27,py34,py35}-django{19}
[testenv] [testenv]
@ -13,7 +13,6 @@ setenv =
PYTHONDONTWRITEBYTECODE=1 PYTHONDONTWRITEBYTECODE=1
PYTHONWARNINGS=once PYTHONWARNINGS=once
deps = deps =
django17: Django==1.7.11
django18: Django==1.8.9 django18: Django==1.8.9
django19: Django==1.9.2 django19: Django==1.9.2
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt