openstack/deb-python-oauth2client
Code Issues Proposed changes

Removing keyring testing from py26 testing.

Browse Source 
With the `6.0` release on January 5, 2016, the `keyring`
package no longer supports Python 2.6 (it won't even
install).
This commit is contained in:
Danny Hermes
2016-01-05 13:25:07 -08:00
parent 3c37f3b3a9
commit fe25c13566
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tox.ini
View File

@@ -2,8 +2,7 @@
envlist = py26,py27,py33,py34,pypy,gae,cover envlist = py26,py27,py33,py34,pypy,gae,cover
[testenv] [testenv]
basedeps = keyring basedeps = mock>=1.3.0
mock>=1.3.0
pycrypto>=2.6 pycrypto>=2.6
cryptography>=1.0 cryptography>=1.0
pyopenssl>=0.14 pyopenssl>=0.14
@@ -13,6 +12,7 @@ basedeps = keyring
unittest2 unittest2
deps = {[testenv]basedeps} deps = {[testenv]basedeps}
django django
keyring
setenv = setenv =
pypy: with_gmp=no pypy: with_gmp=no
DJANGO_SETTINGS_MODULE=tests.contrib.test_django_settings DJANGO_SETTINGS_MODULE=tests.contrib.test_django_settings
@@ -53,6 +53,7 @@ commands =
--ignore-files=test_django_orm\.py \ --ignore-files=test_django_orm\.py \
--ignore-files=test_django_settings\.py \ --ignore-files=test_django_settings\.py \
--ignore-files=test_django_util\.py \ --ignore-files=test_django_util\.py \
--ignore-files=test_keyring_storage\.py \
--exclude-dir=oauth2client/contrib/django_util \ --exclude-dir=oauth2client/contrib/django_util \
{posargs} {posargs}
deps = {[testenv]basedeps} deps = {[testenv]basedeps}
@@ -70,6 +71,7 @@ commands =
--exclude-dir=oauth2client/contrib/django_util \ --exclude-dir=oauth2client/contrib/django_util \
{posargs} {posargs}
deps = {[testenv]basedeps} deps = {[testenv]basedeps}
keyring
nose-exclude nose-exclude
[testenv:cover] [testenv:cover]