diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-02 20:38:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-02 20:38:45 +0000 |
| commit | 25d6396781390e3087c1b254861b0fc3c8b29a45 (patch) | |
| tree | b361ab8d51ed17c5d0b510c78c82a485c92ccd48 | |
| parent | 5e296e09744f9b49969deb4104f4d1c91d7575b5 (diff) | |
| parent | e46f0dccd70751c2d4142a1592fc1c9164581a03 (diff) | |
| download | django_openstack_auth-25d6396781390e3087c1b254861b0fc3c8b29a45.tar.gz | |
Merge "Fix Django 1.10 tox env"
| -rw-r--r-- | tox.ini | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -34,8 +34,8 @@ commands = pip install django>=1.9,<1.10 python openstack_auth/tests/run_tests.py {posargs} [testenv:py27dj110] -commands = pip install django --pre --upgrade - /bin/bash run_tests.sh -N --no-pep8 {posargs} +commands = pip install django>=1.10,<2.0 + python openstack_auth/tests/run_tests.py {posargs} [testenv:pep8] setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings |