Merge branch 'features' into setuptools-scm-take-2

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,6 +3,9 @@ Thanks for submitting a PR, your contribution is really appreciated!
 Here's a quick checklist that should be present in PRs:
 
 - [ ] Target: for bug or doc fixes, target `master`; for new features, target `features`;
+
+Unless your change is trivial documentation fix (e.g.,  a typo or reword of a small section) please:
+
 - [ ] Make sure to include one or more tests for your change;
 - [ ] Add yourself to `AUTHORS`;
 - [ ] Add a new entry to `CHANGELOG.rst`

.travis.yml

@@ -8,27 +8,37 @@ install: "pip install -U tox"
 env:
   matrix:
     # coveralls is not listed in tox's envlist, but should run in travis
-    - TESTENV=coveralls
+    - TOXENV=coveralls
     # note: please use "tox --listenvs" to populate the build matrix below
-    - TESTENV=linting
-    - TESTENV=py26
-    - TESTENV=py27
-    - TESTENV=py33
-    - TESTENV=py34
-    - TESTENV=py35
-    - TESTENV=pypy
-    - TESTENV=py27-pexpect
-    - TESTENV=py27-xdist
-    - TESTENV=py27-trial
-    - TESTENV=py35-pexpect
-    - TESTENV=py35-xdist
-    - TESTENV=py35-trial
-    - TESTENV=py27-nobyte
-    - TESTENV=doctesting
-    - TESTENV=freeze
-    - TESTENV=docs
+    - TOXENV=linting
+    - TOXENV=py26
+    - TOXENV=py27
+    - TOXENV=py33
+    - TOXENV=py34
+    - TOXENV=py35
+    - TOXENV=pypy
+    - TOXENV=py27-pexpect
+    - TOXENV=py27-xdist
+    - TOXENV=py27-trial
+    - TOXENV=py35-pexpect
+    - TOXENV=py35-xdist
+    - TOXENV=py35-trial
+    - TOXENV=py27-nobyte
+    - TOXENV=doctesting
+    - TOXENV=freeze
+    - TOXENV=docs
 
-script: tox --recreate -e $TESTENV
+matrix:
+  include:
+    - env: TOXENV=py36
+      python: '3.6-dev'
+    - env: TOXENV=py37
+      python: 'nightly'
+  allow_failures:
+    - env: TOXENV=py37
+      python: 'nightly'
+
+script: tox --recreate
 
 notifications:
   irc:

AUTHORS

@@ -13,9 +13,11 @@ Andrzej Ostrowski
 Andy Freeland
 Anthon van der Neut
 Antony Lee
+Anthony Sottile
 Armin Rigo
 Aron Curzon
 Aviv Palivoda
+Barney Gale
 Ben Webb
 Benjamin Peterson
 Bernard Pratz
@@ -36,16 +38,20 @@ Christopher Gilling
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
+Daniel Wandschneider
 Danielle Jenkins
 Dave Hunt
 David Díaz-Barquero
 David Mohr
 David Vierra
+Denis Kirisov
 Diego Russo
 Dmitry Dygalo
+Duncan Betts
 Edison Gustavo Muenz
 Edoardo Batini
 Eduardo Schettino
+Eli Boyarski
 Elizaveta Shashkova
 Endre Galaczi
 Eric Hunsberger
@@ -59,6 +65,7 @@ Georgy Dyuldin
 Graham Horler
 Greg Price
 Grig Gheorghiu
+Grigorii Eremeev (budulianin)
 Guido Wesdorp
 Harald Armin Massa
 Ian Bicking
@@ -68,8 +75,10 @@ Janne Vanhala
 Jason R. Coombs
 Javier Domingo Cansino
 Javier Romero
+Jeff Widman
 John Towler
 Jon Sonesen
+Jonas Obrist
 Jordan Guymon
 Joshua Bronson
 Jurko Gospodnetić
@@ -78,33 +87,50 @@ Kale Kundert
 Katarzyna Jachim
 Kevin Cox
 Lee Kamentsky
+Lev Maximov
+Loic Esteve
 Lukas Bednar
+Luke Murphy
 Maciek Fijalkowski
 Maho
+Mandeep Bhutani
+Manuel Krebber
 Marc Schlaich
 Marcin Bachry
 Mark Abramowitz
 Markus Unterwaditzer
 Martijn Faassen
 Martin K. Scherer
 Martin Prusse
+Mathieu Clabaut
 Matt Bachmann
+Matt Duck
 Matt Williams
 Matthias Hafner
+mbyt
 Michael Aquilina
 Michael Birtwell
 Michael Droettboom
+Michael Seifert
+Michal Wajszczuk
 Mike Lundy
+Ned Batchelder
+Neven Mundar
 Nicolas Delaby
 Oleg Pidsadnyi
 Oliver Bestwalter
 Omar Kohl
+Omer Hadari
+Patrick Hayes
 Pieter Mulder
 Piotr Banaszkiewicz
 Punyashloka Biswal
 Quentin Pradet
 Ralf Schmitt
+Ran Benita
 Raphael Pierzina
+Raquel Alegre
+Ravi Chandra
 Roberto Polli
 Romain Dorgueil
 Roman Bolshakov
@@ -124,6 +150,10 @@ Ted Xiao
 Thomas Grainger
 Tom Viner
 Trevor Bekolay
+Tyler Goodlet
 Vasily Kuznetsov
+Victor Uriarte
+Vlad Dragos
+Vidar T. Fauske
 Wouter van Ackooy
 Xuecong Liao