Skip to content

Add support and testing for PyPy 4.0 #86

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 4 commits into from
Nov 5, 2015
Merged

Add support and testing for PyPy 4.0 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b31ff7
Add support and testing for PyPy 4.0
jmoldow Nov 3, 2015
cb6abe1
Merge branch 'master' into pypy
Jeff-Meadows Nov 5, 2015
27eb9e8
Bump version to 1.3.0.
Jeff-Meadows Nov 5, 2015
cd99e4d
Merge branch 'master' into pypy
Jeff-Meadows Nov 5, 2015
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ matrix:
- python: 3.5
env: TOX_ENV=py35
- python: pypy
env: TOX_ENV=pypy
env: TOX_ENV=pypy PYPY_VERSION='4.0.0'
- python: 2.7
env: TOX_ENV=pep8
- python: 2.7
Expand Down
10 changes: 5 additions & 5 deletions .travis/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
pyenv global 3.5.0
;;
pypy)
pyenv install pypy-2.6.0
pyenv global pypy-2.6.0
pyenv install "pypy-${PYPY_VERSION}"
pyenv global "pypy-${PYPY_VERSION}"
;;
esac
pyenv rehash
python -m pip install -U --user virtualenv
else
# temporary pyenv installation to get pypy-2.6 before container infra upgrade
# pyenv installation to get specified pypy version (Travis may only have older version(s))
if [[ "${TOX_ENV}" == "pypy" ]]; then
git clone https://github.com/yyuu/pyenv.git $PWD/.pyenv
export PYENV_ROOT="$PWD/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
pyenv install pypy-2.6.0
pyenv global pypy-2.6.0
pyenv install "pypy-${PYPY_VERSION}"
pyenv global "pypy-${PYPY_VERSION}"
fi
pip install -U virtualenv
fi
Expand Down
2 changes: 1 addition & 1 deletion .travis/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ else
export PYENV_ROOT="$PWD/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
pyenv global pypy-2.6.0
pyenv global "pypy-${PYPY_VERSION}"
fi
fi
source $PWD/.venv/bin/activate
Expand Down
3 changes: 3 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ Release History
Upcoming
++++++++

1.3.0 (2015-11-05)
++++++++++++++++++

- CPython 3.5 support.
- Support for cryptography>=1.0 on PyPy 2.6.
- Travis CI testing for CPython 3.5 and PyPy 2.6.0.
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ Run all tests using -
The tox tests include code style checks via pep8 and pylint.

The tox tests are configured to run on Python 2.6, 2.7, 3.3, 3.4, 3.5, and
PyPy 2.6.
PyPy (our CI is configured to run PyPy tests on PyPy 4.0).


Support
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def main():
install_requires.append('ordereddict>=1.1')
setup(
name='boxsdk',
version='1.2.2',
version='1.3.0',
description='Official Box Python SDK',
long_description=open(join(base_dir, 'README.rst')).read(),
author='Box',
Expand Down