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

This commit is contained in:
高辛格 2019-07-05 21:43:50 +08:00
commit ed7436169c
4 changed files with 6 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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