Merge pull request #2573 from hugovk/update-pypy

Travis CI: Update PyPy

.travis.yml

@@ -10,8 +10,8 @@ notifications:
 matrix:
   fast_finish: true
   include:
-    - python: "pypy"
+    - python: "pypy-5.7.1"
-    - python: "pypy3"
+    - python: "pypy3.3-5.2-alpha1"
     - python: '3.6'
     - python: '2.7'
     - python:  "2.7_with_system_site_packages" # For PyQt4

.travis/install.sh

@@ -9,12 +9,10 @@ pip install cffi
 pip install nose
 pip install check-manifest
 pip install olefile
-# Pyroma tests sometimes hang on PyPy; skip
+pip install pyroma
-if [ "$TRAVIS_PYTHON_VERSION" != "pypy" ]; then pip install pyroma; fi
-
 pip install coverage
 
-# docs only on python 2.7
+# docs only on Python 2.7
 if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then pip install -r requirements.txt ; fi
 
 # clean checkout for manifest

mp_compile.py

@@ -54,7 +54,8 @@ def _mp_compile(self, sources, output_dir=None, macros=None,
 
 def install():
 
-    fl_pypy3 = hasattr(sys, 'pypy_version_info') and sys.version_info > (3, 0)
+    fl_pypy3 = (hasattr(sys, 'pypy_version_info') and
+                (3, 0) < sys.version_info < (3, 3))
     fl_win = sys.platform.startswith('win')
     fl_cygwin = sys.platform.startswith('cygwin')
 
@@ -82,4 +83,5 @@ def install():
         print("Single threaded build, not installing mp_compile:"
               "%s processes" % MAX_PROCS)
 
+
 install()