Skip to content

Commit 964ccb9

Browse files
nicoddemusnicoddemus
authored
Merge pull request #2163 from nicoddemus/merge-master-into-features
Merge master into features
2 parents 669332b + 402fbe5 commit 964ccb9

48 files changed

Lines changed: 626 additions & 317 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ env:
3030

3131
matrix:
3232
allow_failures:
33-
# py35-trial failing on Linux: #1989
33+
# see #1989
34+
- env: TESTENV=py27-trial
3435
- env: TESTENV=py35-trial
36+
include:
37+
- env: TESTENV=py36
38+
python: '3.6-dev'
3539

3640
script: tox --recreate -e $TESTENV
3741

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ Katarzyna Jachim
8282
Kevin Cox
8383
Lee Kamentsky
8484
Lev Maximov
85+
Loic Esteve
8586
Lukas Bednar
8687
Luke Murphy
8788
Maciek Fijalkowski

0 commit comments

Comments
 (0)