[Python-modules-commits] [python-social-auth] 196/322: Merge pull request #557 from jpadilla/pyjwt

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to tag v0.2.10
in repository python-social-auth.

commit 7cf61a1a9cbd600ff7f599555d9240a1b98daa11
Merge: d69903d d25b5fd
Author: Matías Aguirre <matiasaguirre at gmail.com>
Date:   Wed Mar 25 00:56:03 2015 -0300

    Merge pull request #557 from jpadilla/pyjwt
    
    Require PyJWT>=1.0.0,<2.0.0

 requirements-python3.txt              | 2 +-
 requirements.txt                      | 2 +-
 setup.py                              | 3 ++-
 social/backends/exacttarget.py        | 2 +-
 social/backends/open_id.py            | 3 ++-
 social/tests/backends/open_id.py      | 3 ++-
 social/tests/requirements-python3.txt | 2 +-
 social/tests/requirements.txt         | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --cc social/tests/requirements-python3.txt
index 995173b,23fc412..bfae69a
--- a/social/tests/requirements-python3.txt
+++ b/social/tests/requirements-python3.txt
@@@ -2,7 -2,6 +2,7 @@@ httpretty==0.6.
  coverage>=3.6
  mock==1.0.1
  nose>=1.2.1
 +rednose>=0.4.1
  requests>=1.1.0
- PyJWT==0.4.1
+ PyJWT>=1.0.0,<2.0.0
  unittest2py3k==0.5.1
diff --cc social/tests/requirements.txt
index eb7022d,1281a8f..33cef25
--- a/social/tests/requirements.txt
+++ b/social/tests/requirements.txt
@@@ -2,7 -2,6 +2,7 @@@ httpretty==0.6.
  coverage>=3.6
  mock==1.0.1
  nose>=1.2.1
 +rednose>=0.4.1
  requests>=1.1.0
- PyJWT==0.4.1
+ PyJWT>=1.0.0,<2.0.0
  unittest2==0.5.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git