Merge branch 'master' into rm-2.7

.github/workflows/test-windows.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-  
+
     runs-on: windows-2016
     strategy:
       fail-fast: false
@@ -19,16 +19,15 @@ jobs:
             platform-vcvars: "x86_amd64"
             platform-msbuild: "x64"
           - python-version: "pypy3.6"
-            pypy-version: "pypy-c-jit-97588-7392d01b93d0-win32"
-            pypy-url: "http://buildbot.pypy.org/nightly/py3.6/pypy-c-jit-97588-7392d01b93d0-win32.zip"
-            # pypy-url: "https://bitbucket.org/pypy/pypy/downloads/${{ matrix.pypy-version }}.zip"
+            pypy-version: "pypy3.6-v7.2.0-win32"
+            pypy-url: "https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-win32.zip"
         exclude:
           - python-version: "pypy3.6"
             architecture: "x64"
     timeout-minutes: 30
-    
+
     name: Python ${{ matrix.python-version }} ${{ matrix.architecture }}
-    
+
     steps:
     - uses: actions/checkout@v1
 
@@ -59,7 +58,7 @@ jobs:
       run: |
         "%pythonLocation%\python.exe" -m pip install wheel pytest pytest-cov
         pip install codecov
-    
+
     - name: Fetch dependencies
       run: |
         curl -fsSL -o nasm.zip https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/win64/nasm-2.14.02-win64.zip
@@ -324,7 +323,7 @@ jobs:
         rem Add GhostScript and Raqm binaries (copied to INCLIB) to PATH.
         path %INCLIB%;%PATH%
         %PYTHON%\python.exe selftest.py --installed
-    
+
     - name: Test Pillow
       run: |
         set PYTHON=%pythonLocation%
@@ -333,7 +332,7 @@ jobs:
         path %INCLIB%;%PATH%
         cd /D %GITHUB_WORKSPACE%
         %PYTHON%\python.exe -m pytest -vx --cov PIL --cov-report term --cov-report xml Tests
-    
+
     - name: Upload coverage
       run: 'codecov --file "%GITHUB_WORKSPACE%\coverage.xml" --name "%pythonLocation%"'
 

CHANGES.rst

@@ -5,6 +5,9 @@ Changelog (Pillow)
 7.0.0 (unreleased)
 ------------------
 
+- Added pypy3 to tox envlist #4137
+  [jdufresne]
+
 - Drop support for EOL PyQt4 and PySide #4108
   [hugovk, radarhere]
 

Tests/helper.py

@@ -207,24 +207,13 @@ def assert_tuple_approx_equal(self, actuals, targets, threshold, msg):
 
         self.assertTrue(value, msg + ": " + repr(actuals) + " != " + repr(targets))
 
-    def skipKnownBadTest(self, msg=None, platform=None, travis=None, interpreter=None):
-        # Skip if platform/travis matches, and
-        # PILLOW_RUN_KNOWN_BAD is not true in the environment.
+    def skipKnownBadTest(self, msg=None):
+        # Skip if PILLOW_RUN_KNOWN_BAD is not true in the environment.
         if os.environ.get("PILLOW_RUN_KNOWN_BAD", False):
             print(os.environ.get("PILLOW_RUN_KNOWN_BAD", False))
             return
 
-        skip = True
-        if platform is not None:
-            skip = sys.platform.startswith(platform)
-        if travis is not None:
-            skip = skip and (travis == bool(os.environ.get("TRAVIS", False)))
-        if interpreter is not None:
-            skip = skip and (
-                interpreter == "pypy" and hasattr(sys, "pypy_version_info")
-            )
-        if skip:
-            self.skipTest(msg or "Known Bad Test")
+        self.skipTest(msg or "Known Bad Test")
 
     def tempfile(self, template):
         assert template[:5] in ("temp.", "temp_")

tox.ini

@@ -6,7 +6,7 @@
 [tox]
 envlist =
     lint
-    py{35,36,37}
+    py{35,36,37,py3}
 minversion = 1.9
 
 [testenv]

winbuild/appveyor_install_pypy3.cmd

@@ -1,3 +1,3 @@
-curl -fsSL -o pypy3.zip http://buildbot.pypy.org/nightly/py3.6/pypy-c-jit-97588-7392d01b93d0-win32.zip
+curl -fsSL -o pypy3.zip https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-win32.zip
 7z x pypy3.zip -oc:\
-c:\Python37\Scripts\virtualenv.exe -p c:\pypy-c-jit-97588-7392d01b93d0-win32\pypy3.exe c:\vp\pypy3
+c:\Python37\Scripts\virtualenv.exe -p c:\pypy3.6-v7.2.0-win32\pypy3.exe c:\vp\pypy3