Skip to content

Fix failing pypy tests. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2015
Merged

Fix failing pypy tests. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ box-python-sdk
.. image:: https://travis-ci.org/box/box-python-sdk.png?branch=master
:target: https://travis-ci.org/box/box-python-sdk

.. image:: https://readthedocs.org/projects/box-python-sdk/badge/?version=latest
:target: http://box-python-sdk.readthedocs.org/en/latest
:alt: Documentation Status

.. image:: https://pypip.in/v/boxsdk/badge.png
:target: https://pypi.python.org/pypi/boxsdk

Expand Down Expand Up @@ -57,8 +61,7 @@ Authenticate (get access/refresh token)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

If you navigate the user to the auth_url,
the user will eventually get redirected to
http://YOUR_REDIRECT_URL?code=YOUR_AUTH_CODE.
the user will eventually get redirected to http://YOUR_REDIRECT_URL?code=YOUR_AUTH_CODE.
After getting the code, you will be able to use the code to exchange for access token and fresh token.

The SDK handles all the work for you; all you need to do is run:
Expand Down
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def main():
install_requires.append('ordereddict>=1.1')
setup(
name='boxsdk',
version='1.0.1',
version='1.0.2',
description='Official Box Python SDK',
long_description=open(join(base_dir, 'README.rst')).read(),
author='Box',
Expand All @@ -68,7 +68,8 @@ def main():
tests_require=['pytest', 'pytest-xdist', 'mock', 'sqlalchemy', 'bottle', 'jsonpatch'],
cmdclass={'test': PyTest},
classifiers=CLASSIFIERS,
keywords='box oauth2 sdk'
keywords='box oauth2 sdk',
license=open(join(base_dir, 'LICENSE')).read(),
)


Expand Down
6 changes: 3 additions & 3 deletions test/unit/object/test_folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def _assert_collaborator_added(test_folder, collaborator, mock_box_session, mock
@pytest.mark.parametrize('role', iter(CollaborationRole))
def test_add_user_collaborator(test_folder, mock_user, mock_box_session, mock_collab_response, notify, role):
data = json.dumps({
'item': {'type': 'folder', 'id': test_folder.object_id},
'item': {'id': test_folder.object_id, 'type': 'folder'},
'accessible_by': {'id': mock_user.object_id, 'type': 'user'},
'role': role,
})
Expand All @@ -71,7 +71,7 @@ def test_add_user_collaborator(test_folder, mock_user, mock_box_session, mock_co
@pytest.mark.parametrize('role', iter(CollaborationRole))
def test_add_group_collaborator(test_folder, mock_group, mock_box_session, mock_collab_response, notify, role):
data = json.dumps({
'item': {'type': 'folder', 'id': test_folder.object_id},
'item': {'id': test_folder.object_id, 'type': 'folder'},
'accessible_by': {'id': mock_group.object_id, 'type': 'group'},
'role': role,
})
Expand All @@ -83,7 +83,7 @@ def test_add_group_collaborator(test_folder, mock_group, mock_box_session, mock_
def test_add_email_collaborator(test_folder, mock_box_session, mock_collab_response, notify, role):
email_address = 'foo@example.com'
data = json.dumps({
'item': {'type': 'folder', 'id': test_folder.object_id},
'item': {'id': test_folder.object_id, 'type': 'folder'},
'accessible_by': {'login': email_address, 'type': 'user'},
'role': role,
})
Expand Down