Merge

.editorconfig

@@ -0,0 +1,24 @@
+# Top-most EditorConfig file
+root = true
+
+[*]
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+# Four-space indentation
+indent_size = 4
+indent_style = space
+
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yml]
+# Two-space indentation
+indent_size = 2
+indent_style = space
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to Pillow
 
-Bug fixes, feature additions, tests, documentation and more can be contributed via [issues](https://github.com/python-pillow/Pillow/issues) and/or [pull requests](https://github.com/python-pillow/Pillow/issues). All contributions are welcome.
+Bug fixes, feature additions, tests, documentation and more can be contributed via [issues](https://github.com/python-pillow/Pillow/issues) and/or [pull requests](https://github.com/python-pillow/Pillow/pulls). All contributions are welcome.
 
 ## Bug fixes, feature additions, etc.
 
@@ -9,14 +9,15 @@ Please send a pull request to the master branch. Please include [documentation](
 - Fork the Pillow repository.
 - Create a branch from master.
 - Develop bug fixes, features, tests, etc.
-- Run the test suite on both Python 2.x and 3.x. You can enable [Travis CI on your repo](https://travis-ci.org/profile/) to catch test failures prior to the pull request, and [Coveralls](https://coveralls.io/repos/new) to see if the changed code is covered by tests.
+- Run the test suite on both Python 2.x and 3.x. You can enable [Travis CI](https://travis-ci.org/profile/) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Coveralls](https://coveralls.io/repos/new) to see if the changed code is covered by tests.
 - Create a pull request to pull the changes from your branch to the Pillow master.
 
 ### Guidelines
 
 - Separate code commits from reformatting commits.
 - Provide tests for any newly added code.
 - Follow PEP8.
+- When committing only documentation changes please include [ci skip] in the commit message to avoid running tests on Travis-CI and AppVeyor.
 
 ## Reporting Issues
 
@@ -28,3 +29,9 @@ When reporting issues, please include code that reproduces the issue and wheneve
 - What did you expect to happen?
 - What actually happened?
 - What versions of Pillow and Python are you using?
+
+## Security vulnerabilities
+
+To report sensitive vulnerability information, email aclark@aclark.net.
+
+If your organisation/employer is a distributor of Pillow and would like advance notification of security-related bugs, please let us know your preferred contact method.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,13 @@
+### What did you do?
+
+### What did you expect to happen?
+
+### What actually happened?
+
+### What versions of Pillow and Python are you using?
+
+Please include code that reproduces the issue and whenever possible, an image that demonstrates the issue. The best reproductions are self-contained scripts with minimal dependencies.
+
+```python
+code goes here
+```

.landscape.yaml

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

.travis.yml

@@ -9,34 +9,51 @@ notifications:
 python:
   - "pypy"
   - "pypy3"
-  - 3.4
+  - 3.5
   - 2.7
   - 2.6
   - "2.7_with_system_site_packages" # For PyQt4
   - 3.2
   - 3.3
+  - 3.4
+  - nightly
 
 install:
+  - "travis_retry sudo apt-get update"
   - "travis_retry sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick"
   - "travis_retry pip install cffi"
-  - "travis_retry pip install coverage nose"
-  - "travis_retry pip install pyroma"
+  - "travis_retry pip install nose"
+  - "travis_retry pip install check-manifest"
+  - "travis_retry pip install Sphinx"
+    # Pyroma tests sometimes hang on PyPy and Python 2.6; skip for those
+  - if [ $TRAVIS_PYTHON_VERSION != "pypy" && $TRAVIS_PYTHON_VERSION != "2.6" ]; then travis_retry pip install pyroma; fi
 
   - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then travis_retry pip install unittest2; fi
 
+  # Coverage 4.0 doesn't support Python 3.2
+  - if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi
+  - if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi
+
+  # clean checkout for manifest
+  - mkdir /tmp/check-manifest && cp -a . /tmp/check-manifest
+
   # webp
   - pushd depends && ./install_webp.sh && popd
 
   # openjpeg
   - pushd depends && ./install_openjpeg.sh && popd
 
 script:
-  - coverage erase
+  - if [ "$TRAVIS_PYTHON_VERSION" != "nightly" ]; then coverage erase; fi
   - python setup.py clean
   - CFLAGS="-coverage" python setup.py build_ext --inplace
 
-  - coverage run --append --include=PIL/* selftest.py
-  - coverage run --append --include=PIL/* -m nose -vx Tests/test_*.py
+  - if [ "$TRAVIS_PYTHON_VERSION" != "nightly" ]; then coverage run --append --include=PIL/* selftest.py; fi
+  - if [ "$TRAVIS_PYTHON_VERSION" != "nightly" ]; then coverage run --append --include=PIL/* -m nose -vx Tests/test_*.py; fi
+  - pushd /tmp/check-manifest && check-manifest --ignore ".coveragerc,.editorconfig,*.yml,*.yaml,tox.ini" && popd
+  # Sphinx
+  - make install
+  - pushd docs; make html; make linkcheck; popd
 
 after_success:
    # gather the coverage data
@@ -54,15 +71,15 @@ after_success:
 
   - travis_retry pip install pep8 pyflakes
   - pep8 --statistics --count PIL/*.py
-  - pep8  --statistics --count Tests/*.py
+  - pep8 --statistics --count Tests/*.py
   - pyflakes *.py       | tee >(wc -l)
   - pyflakes PIL/*.py   | tee >(wc -l)
   - pyflakes Tests/*.py | tee >(wc -l)
 
     # Coverage and quality reports on just the latest diff.
     # (Installation is very slow on Py3, so just do it for Py2.)
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then Scripts/diffcover-install.sh; fi
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then Scripts/diffcover-run.sh; fi
+  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-install.sh; fi
+  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-run.sh; fi
 
   # after_all
   - |
@@ -104,6 +121,8 @@ after_script:
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - python: nightly
 
 env:
   global: