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
1bb5fb8e
Commit
1bb5fb8e
authored
Jun 02, 2013
by
Tom Christie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #895 from linovia/django1.6a1
Added Django 1.6a1 to the test matrix.
parents
a3796f43
9d4fc322
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
.travis.yml
+2
-1
rest_framework/runtests/runtests.py
+6
-1
No files found.
.travis.yml
View file @
1bb5fb8e
...
...
@@ -7,6 +7,7 @@ python:
-
"
3.3"
env
:
-
DJANGO="https://www.djangoproject.com/download/1.6a1/tarball/"
-
DJANGO="django==1.5.1 --use-mirrors"
-
DJANGO="django==1.4.5 --use-mirrors"
-
DJANGO="django==1.3.7 --use-mirrors"
...
...
@@ -16,7 +17,7 @@ install:
-
pip install defusedxml==0.3
-
"
if
[[
${TRAVIS_PYTHON_VERSION::1}
!=
'3'
]];
then
pip
install
oauth2==1.5.211
--use-mirrors;
fi"
-
"
if
[[
${TRAVIS_PYTHON_VERSION::1}
!=
'3'
]];
then
pip
install
django-oauth-plus==2.0
--use-mirrors;
fi"
-
"
if
[[
${TRAVIS_PYTHON_VERSION::1}
!=
'3'
]];
then
pip
install
django-oauth2-provider==0.2.
3
--use-mirrors;
fi"
-
"
if
[[
${TRAVIS_PYTHON_VERSION::1}
!=
'3'
]];
then
pip
install
django-oauth2-provider==0.2.
4
--use-mirrors;
fi"
-
"
if
[[
${DJANGO::11}
==
'django==1.3'
]];
then
pip
install
django-filter==0.5.4
--use-mirrors;
fi"
-
"
if
[[
${DJANGO::11}
!=
'django==1.3'
]];
then
pip
install
django-filter==0.6
--use-mirrors;
fi"
-
export PYTHONPATH=.
...
...
rest_framework/runtests/runtests.py
View file @
1bb5fb8e
...
...
@@ -10,6 +10,7 @@ import sys
sys
.
path
.
append
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
"../.."
))
os
.
environ
[
'DJANGO_SETTINGS_MODULE'
]
=
'rest_framework.runtests.settings'
import
django
from
django.conf
import
settings
from
django.test.utils
import
get_runner
...
...
@@ -35,7 +36,11 @@ def main():
else
:
print
(
usage
())
sys
.
exit
(
1
)
failures
=
test_runner
.
run_tests
([
'tests'
+
test_case
])
test_module_name
=
'rest_framework.tests'
if
django
.
VERSION
[
0
]
==
1
and
django
.
VERSION
[
1
]
<
6
:
test_module_name
=
'tests'
failures
=
test_runner
.
run_tests
([
test_module_name
+
test_case
])
sys
.
exit
(
failures
)
...
...
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