reencode non-ascii python2 assertion reprs, fixes #877

.coveragerc

@@ -0,0 +1,6 @@
+[run]
+omit = 
+    # standlonetemplate is read dynamically and tested by test_genscript
+    *standalonetemplate.py
+    # oldinterpret could be removed, as it is no longer used in py26+
+    *oldinterpret.py

.gitattributes

@@ -0,0 +1 @@
+CHANGELOG    merge=union

.gitignore

@@ -17,6 +17,11 @@ include/
 *.orig
 *~
 
+.eggs/
+
+# this file is managed by setuptools_scm
+_pytest/__init__.py
+
 doc/*/_build
 build/
 dist/

.travis.yml

@@ -7,31 +7,35 @@ install: "pip install -U tox"
 # # command to run tests
 env:
   matrix:
+    - TESTENV=coveralls
+    - TESTENV=doctesting
     - TESTENV=flakes
     - TESTENV=py26
     - TESTENV=py27
-    - TESTENV=py33
-    - TESTENV=py34
-    - TESTENV=py35
-    - TESTENV=pypy
-    - TESTENV=py27-pexpect
-    - TESTENV=py34-pexpect
+    - TESTENV=py27-cxfreeze
     - TESTENV=py27-nobyte
-    - TESTENV=py27-xdist
-    - TESTENV=py34-xdist
+    - TESTENV=py27-pexpect
+    - TESTENV=py27-subprocess
     - TESTENV=py27-trial
+    - TESTENV=py27-xdist
+    - TESTENV=py33
     - TESTENV=py33
+    - TESTENV=py34
+    - TESTENV=py34-pexpect
     - TESTENV=py34-trial
-    # inprocess tests by default were introduced in 2.8 only;
-    # this TESTENV should be enabled when merged back to master
-    #- TESTENV=py27-subprocess
-    - TESTENV=doctesting
-    - TESTENV=py27-cxfreeze
-    - TESTENV=coveralls
-script: tox --recreate -i ALL=https://devpi.net/hpk/dev/ -e $TESTENV
+    - TESTENV=py34-trial
+    - TESTENV=py34-xdist
+    - TESTENV=py35
+    - TESTENV=pypy
+
+script: tox --recreate -e $TESTENV
 
 notifications:
   irc:
-    - "chat.freenode.net#pytest-dev"
+    channels:
+      - "chat.freenode.net#pytest"
+    on_success: change
+    on_failure: change
+    skip_join: true
   email:
     - [email protected]

AUTHORS

@@ -3,6 +3,7 @@ merlinux GmbH, Germany, office at merlinux eu
 
 Contributors include::
 
+Abhijeet Kasurde
 Anatoly Bubenkoff
 Andreas Zeidler
 Andy Freeland
@@ -14,6 +15,7 @@ Bob Ippolito
 Brian Dorsey
 Brian Okken
 Brianna Laugher
+Bruno Oliveira
 Carl Friedrich Bolz
 Charles Cloud
 Chris Lamb
@@ -25,6 +27,11 @@ Daniel Nuri
 Dave Hunt
 David Mohr
 Edison Gustavo Muenz
+Eduardo Schettino
+Elizaveta Shashkova
+Eric Hunsberger
+Eric Siegerman
+Florian Bruhin
 Floris Bruynooghe
 Graham Horler
 Grig Gheorghiu
@@ -33,13 +40,16 @@ Harald Armin Massa
 Ian Bicking
 Jaap Broekhuizen
 Jan Balster
+Janne Vanhala
 Jason R. Coombs
 Jurko Gospodnetić
 Katarzyna Jachim
+Kevin Cox
 Maciek Fijalkowski
 Maho
 Marc Schlaich
 Mark Abramowitz
+Markus Unterwaditzer
 Martijn Faassen
 Nicolas Delaby
 Pieter Mulder
@@ -52,3 +62,4 @@ Samuele Pedroni
 Tom Viner
 Trevor Bekolay
 Wouter van Ackooy
+David Díaz-Barquero