Merge pull request #86 from box/pypy

Add support and testing for PyPy 4.0
box · Nov 5, 2015 · 1b2d196 · 1b2d196
2 parents 0fd40a6 + cd99e4d
commit 1b2d196
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -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

diff --git a/.travis/run.sh b/.travis/run.sh
@@ -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

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -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.

diff --git a/README.rst b/README.rst
@@ -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

diff --git a/setup.py b/setup.py
@@ -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',