Skip to content

Commit 6597e93

Browse files
authored
Merge pull request #187 from box/release-2.0.0a4-branch
Prepare for next 2.0.0 alpha release
2 parents f3057aa + 5ffb230 commit 6597e93

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ matrix:
2020
env: TOX_ENV=py34
2121
- python: 3.5
2222
env: TOX_ENV=py35
23-
- python: "3.6-dev"
23+
- python: 3.6
2424
env: TOX_ENV=py36
2525
- python: pypy
2626
env: TOX_ENV=pypy PYPY_VERSION='4.0.0'

.travis/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
4242
pyenv global 3.5.0
4343
;;
4444
py36)
45-
pyenv install 3.6-dev
46-
pyenv global 3.6-dev
45+
pyenv install 3.6.0
46+
pyenv global 3.6.0
4747
;;
4848
pypy)
4949
pyenv install "pypy-${PYPY_VERSION}"

HISTORY.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ Release History
7474
- Added an ``Event`` class.
7575
- Moved ``metadata()`` method to ``Item`` so it's now available for ``Folder``
7676
as well as ``File``.
77+
- The ``BaseAPIJSONObject`` baseclass (which is a superclass of all API
78+
response objects) now supports ``__contains__`` and ``__iter__``. They behave
79+
the same as for ``Mapping``. That is, ``__contains__`` checks for JSON keys
80+
in the object, and ``__iter__`` yields all of the object's keys.
7781

7882
**Other**
7983

boxsdk/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
from __future__ import unicode_literals, absolute_import
44

55

6-
__version__ = '2.0.0a3'
6+
__version__ = '2.0.0a4'

0 commit comments

Comments
 (0)