Merge remote-tracking branch 'upstream/master' into issue3738

.landscape.yaml

@@ -1,3 +0,0 @@
-strictness: medium
-test-warnings: yes
-max-line-length: 80

.travis/install.sh

@@ -28,5 +28,8 @@ pushd depends && ./install_openjpeg.sh && popd
 # libimagequant
 pushd depends && ./install_imagequant.sh && popd
 
+# raqm
+pushd depends && ./install_raqm.sh && popd
+
 # extra test images
 pushd depends && ./install_extra_test_images.sh && popd

MANIFEST.in

@@ -1,4 +1,3 @@
-
 include *.c
 include *.h
 include *.in
@@ -9,6 +8,7 @@ include *.sh
 include *.txt
 include LICENSE
 include Makefile
+include tox.ini
 graft Tests
 graft src
 graft depends
@@ -21,10 +21,8 @@ exclude .appveyor.yml
 exclude .coveragerc
 exclude .codecov.yml
 exclude .editorconfig
-exclude .landscape.yaml
 exclude .readthedocs.yml
 exclude azure-pipelines.yml
-exclude tox.ini
 global-exclude .git*
 global-exclude *.pyc
 global-exclude *.so

winbuild/build.py

@@ -50,9 +50,9 @@ def run_script(params):
         (trace, stderr) = proc.communicate()
         status = proc.returncode
         print("-- stderr --")
-        print(stderr)
+        print(stderr.decode())
         print("-- stdout --")
-        print(trace)
+        print(trace.decode())
         print("Done with %s: %s" % (version, status))
         return (version, status, trace, stderr)
     except Exception as msg: