diff options
| author | Pierre Dulac | 2013-03-02 20:18:50 +0100 |
|---|---|---|
| committer | Pierre Dulac | 2013-03-06 19:15:33 +0100 |
| commit | 6f5764105b2c361a85bc3933c943d98659bdbd68 (patch) | |
| tree | 721667fe6acafa0d599ba3b52467399330a2e338 | |
| parent | c449dd4f4d8c9602c826e906870a87c13d6689de (diff) | |
| download | django-rest-framework-6f5764105b2c361a85bc3933c943d98659bdbd68.tar.bz2 | |
Use the PyPI django-oauth2-provider version
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | optionals.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 44786bf2..82127276 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: install: - pip install $DJANGO - pip install defusedxml==0.3 - - "pip install -e git+git://github.com/caffeinehit/django-oauth2-provider.git#egg=django-oauth2-provider" + - "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-filter==0.5.4 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install https://github.com/alex/django-filter/tarball/master; fi" - export PYTHONPATH=. diff --git a/optionals.txt b/optionals.txt index a36e9e94..99868c66 100644 --- a/optionals.txt +++ b/optionals.txt @@ -2,4 +2,4 @@ markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-filter>=0.5.4 --e git+git://github.com/caffeinehit/django-oauth2-provider.git@3198060acfe14730ce2d81310cbf2b13f6403438#egg=django_oauth2_provider-dev
\ No newline at end of file +django-oauth2-provider>=0.2.3
\ No newline at end of file @@ -21,33 +21,39 @@ deps = django==1.5 basepython = python2.7 deps = django==1.5 django-filter==0.5.4 + django-oauth2-provider==0.2.3 [testenv:py2.6-django1.5] basepython = python2.6 deps = django==1.5 django-filter==0.5.4 defusedxml==0.3 + django-oauth2-provider==0.2.3 [testenv:py2.7-django1.4] basepython = python2.7 deps = django==1.4.3 django-filter==0.5.4 defusedxml==0.3 + django-oauth2-provider==0.2.3 [testenv:py2.6-django1.4] basepython = python2.6 deps = django==1.4.3 django-filter==0.5.4 defusedxml==0.3 + django-oauth2-provider==0.2.3 [testenv:py2.7-django1.3] basepython = python2.7 deps = django==1.3.5 django-filter==0.5.4 defusedxml==0.3 + django-oauth2-provider==0.2.3 [testenv:py2.6-django1.3] basepython = python2.6 deps = django==1.3.5 django-filter==0.5.4 defusedxml==0.3 + django-oauth2-provider==0.2.3 |