Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
b001a146
Commit
b001a146
authored
Nov 17, 2014
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add django master to build matrix. Closes #2075.
parent
4e035184
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
1 deletions
+33
-1
.travis.yml
+10
-0
tox.ini
+23
-1
No files found.
.travis.yml
View file @
b001a146
...
...
@@ -20,6 +20,16 @@ env:
-
TOX_ENV=py2.6-django1.5
-
TOX_ENV=py2.7-django1.4
-
TOX_ENV=py2.6-django1.4
-
TOX_ENV=py3.4-djangomaster
-
TOX_ENV=py3.3-djangomaster
-
TOX_ENV=py2.7-djangomaster
matrix
:
fast_finish
:
true
allow_failures
:
-
env
:
TOX_ENV=py3.4-djangomaster
-
env
:
TOX_ENV=py3.3-djangomaster
-
env
:
TOX_ENV=py2.7-djangomaster
install
:
-
"
pip
install
tox
--download-cache
$HOME/.pip-cache"
...
...
tox.ini
View file @
b001a146
...
...
@@ -5,7 +5,8 @@ envlist =
py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7,
py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,
py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,
py2.7-django1.4,py2.6-django1.4
py2.7-django1.4,py2.6-django1.4,
py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster
[testenv]
commands
=
./runtests.py --fast
...
...
@@ -157,3 +158,24 @@ deps = django==1.4.11
django-oauth2-provider
=
=0.2.3
django-guardian
=
=1.2.3
pytest-django
=
=2.6.1
[testenv:py3.4-djangomaster]
basepython
=
python3.4
deps
=
https://github.com/django/django/zipball/master
django-filter
=
=0.7
defusedxml
=
=0.3
pytest-django
=
=2.6.1
[testenv:py3.3-djangomaster]
basepython
=
python3.3
deps
=
https://github.com/django/django/zipball/master
django-filter
=
=0.7
defusedxml
=
=0.3
pytest-django
=
=2.6.1
[testenv:py2.7-djangomaster]
basepython
=
python3.2
deps
=
https://github.com/django/django/zipball/master
django-filter
=
=0.7
defusedxml
=
=0.3
pytest-django
=
=2.6.1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment