Skip to content

Commit fd6d22b

Browse files
committed
Bump version to 1.2.2.
1 parent 1f77a95 commit fd6d22b

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

HISTORY.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ Upcoming
99
1.2.1 (2015-07-22)
1010
++++++++++++++++++
1111

12+
- The SDK now supports setting a password when creating a shared link.
13+
14+
1.2.1 (2015-07-22)
15+
++++++++++++++++++
16+
1217
**Bugfixes**
1318

1419
- Fixed an ImportError for installs that didn't install the [jwt] extras.

setup.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import unicode_literals
44

55
from os.path import dirname, join
6+
import platform
67
import sys
78
from sys import version_info
89

@@ -51,21 +52,26 @@ def run_tests(self):
5152
def main():
5253
base_dir = dirname(__file__)
5354
install_requires = ['requests>=2.4.3', 'six>=1.4.0']
55+
jwt_requires = ['pyjwt>=1.3.0']
56+
if platform.python_implementation() == 'PyPy':
57+
jwt_requires.append('cryptography>=0.9.2, <1.0')
58+
else:
59+
jwt_requires.append('cryptography>=0.9.2')
5460
if version_info < (3, 4):
5561
install_requires.append('enum34>=1.0.4')
5662
elif version_info < (2, 7):
5763
install_requires.append('ordereddict>=1.1')
5864
setup(
5965
name='boxsdk',
60-
version='1.2.1',
66+
version='1.2.2',
6167
description='Official Box Python SDK',
6268
long_description=open(join(base_dir, 'README.rst')).read(),
6369
author='Box',
6470
author_email='[email protected]',
6571
url='http://opensource.box.com',
6672
packages=find_packages(exclude=['demo', 'docs', 'test']),
6773
install_requires=install_requires,
68-
extras_require={'jwt': ['cryptography>=0.9.2', 'pyjwt>=1.3.0']},
74+
extras_require={'jwt': jwt_requires},
6975
tests_require=['pytest', 'pytest-xdist', 'mock', 'sqlalchemy', 'bottle', 'jsonpatch'],
7076
cmdclass={'test': PyTest},
7177
classifiers=CLASSIFIERS,

0 commit comments

Comments
 (0)