Merge pull request #247 from AzureAD/release-1.2.6

Release 1.2.6

Author: rayluo

adal/__init__.py

@@ -27,7 +27,7 @@
 
 # pylint: disable=wrong-import-position
 
-__version__ = '1.2.5'
+__version__ = '1.2.6'
 
 import logging
 

adal/self_signed_jwt.py

@@ -57,7 +57,11 @@ def _sign_jwt(header, payload, certificate):
     return encoded_jwt
 
 def _encode_jwt(payload, certificate, header):
-    return jwt.encode(payload, certificate, algorithm='RS256', headers=header).decode()
+    encoded = jwt.encode(payload, certificate, algorithm='RS256', headers=header)
+    try:
+        return encoded.decode()  # PyJWT 1.x returns bytes; historically we convert it to string
+    except AttributeError:
+        return encoded  # PyJWT 2 will return string
 
 def _raise_on_invalid_jwt_signature(encoded_jwt):
     segments = encoded_jwt.split('.')

requirements.txt

@@ -2,8 +2,12 @@ requests==2.20.0
 PyJWT==1.7.0
 #need 2.x for Python3 support
 python-dateutil==2.1.0
+
 #1.1.0 is the first that can be installed on windows
-cryptography==2.3.1
+# Yet we decide to remove this from requirements.txt,
+# because ADAL does not have a direct dependency on it.
+#cryptography==3.2
+
 #for testing
 httpretty==0.8.14
 pylint==1.5.4

setup.py

@@ -76,9 +76,9 @@
     ],
     packages=['adal'],
     install_requires=[
-        'PyJWT>=1.0.0',
-        'requests>=2.0.0',
-        'python-dateutil>=2.1.0',
+        'PyJWT>=1.0.0,<3',
+        'requests>=2.0.0,<3',
+        'python-dateutil>=2.1.0,<3',
         'cryptography>=1.1.0'
     ]
 )