merge latest master into features as well

.travis.yml

@@ -7,25 +7,25 @@ install: "pip install -U tox"
 # # command to run tests
 env:
   matrix:
+    # coveralls is not listed in tox's envlist, but should run in travis
     - TESTENV=coveralls
-    - TESTENV=doctesting
+    # note: please use "tox --listenvs" to populate the build matrix below
     - TESTENV=linting
     - TESTENV=py26
     - TESTENV=py27
-    - TESTENV=py27-cxfreeze
-    - TESTENV=py27-nobyte
-    - TESTENV=py27-pexpect
-    - TESTENV=py27-subprocess
-    - TESTENV=py27-trial
-    - TESTENV=py27-xdist
-    - TESTENV=py33
     - TESTENV=py33
     - TESTENV=py34
-    - TESTENV=py35-pexpect
-    - TESTENV=py35-trial
-    - TESTENV=py35-xdist
     - 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=py27-cxfreeze
 
 script: tox --recreate -e $TESTENV
 

ISSUES.txt

@@ -18,6 +18,7 @@ Unlike mock, "args.path" acts on the parsed auto-spec'ed ``os.path.abspath``
 so it's independent from if the client side called "os.path.abspath(path=...)"
 or "os.path.abspath('positional')".
 
+
 refine parametrize API
 -------------------------------------------------------------
 tags: critical feature 

appveyor.yml

@@ -1,19 +1,29 @@
+environment:
+  COVERALLS_REPO_TOKEN:
+    secure: 2NJ5Ct55cHJ9WEg3xbSqCuv0rdgzzb6pnzOIG5OkMbTndw3wOBrXntWFoQrXiMFi
+    # this is pytest's token in coveralls.io, encrypted
+    # using pytestbot account as detailed here:
+    # https://www.appveyor.com/docs/build-configuration#secure-variables
+
 install:
   - echo Installed Pythons
   - dir c:\Python*
 
+  # install pypy using choco (redirect to a file and write to console in case
+  # choco install returns non-zero, because choco install python.pypy is too
+  # noisy)
+  - choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1)
+  - set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy
+  - echo PyPy installed
+  - pypy --version
+
   - C:\Python35\python -m pip install tox
 
 build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
-  - 'set TESTENVS=
+  - C:\Python35\python -m tox  
           linting,
-          py26,
-          py27,
-          py33,
-          py34,
-          py27-xdist,
-          py35-xdist
-    '
-  - C:\Python35\python -m tox -e "%TESTENVS%"
+  # coveralls is not in tox's envlist, plus for PRs the secure variable
+  # is not defined so we have to check for it
+  - if defined COVERALLS_REPO_TOKEN C:\Python35\python -m tox -e coveralls

doc/en/announce/sprint-funding-2016.txt

@@ -0,0 +1,62 @@
+
+call for (funding of) the next pytest-sprint
+======================================================
+
+The pytest core group is looking for donations or invoiced
+money from companies and individuals in order to fund travels
+and accomodation for the next pytest sprint, June 20-26th 2016
+in Freiburg, Germany.  If this works out you can expect some
+great new developments in the python testing space to be released
+in 2016.  Here is a short list of preliminary topics:
+
+- improving pytest-xdist test scheduling to take into account
+  fixture setups and explicit user hints.
+
+- provide info on fixture dependencies during --collect-only
+
+- tying pytest-xdist to tox so that you can do "py.test -e py34"
+  to run tests in a particular tox-managed virtualenv.  Also
+  look into making pytest-xdist use tox environments on
+  remote ssh-sides so that remote dependency management becomes
+  easier.
+
+- refactoring the fixture system so more people understand it :)
+
+- integrating PyUnit setup methods as autouse fixtures.
+  possibly adding ways to influence ordering of same-scoped
+  fixtures (so you can make a choice of which fixtures come
+  before others)
+
+- fixing bugs and issues from the tracker, really an endless source :)
+
+The sprint is going to take place for several days with a break
+day in between in the black forest town Freiburg in Germany
+which also means we are going to do some hiking likely.
+
+Here are preliminary participants who said they are likely to come,
+given some expenses funding::
+
+    Andreas Pelme, Sweden
+    Brianna Laughner, Australia
+    Bruno Oliveira, Brazil
+    Floris Bruhin, Switzerland
+    Florian Bruynooghe, UK
+    Holger Krekel, Germany
+    Omar Kohl, Germany
+    Raphael Pierzina, US/UK
+
+Other contributors and newcomers are invited to join as well but please
+send a mail to the pytest-dev mailing list if you intend to do so
+somewhat soon, also how much funding you need if so.  And if you are
+working for a company and using pytest heavily you are welcome to join
+and we encourage your company to provide some funding for the
+sprint.  They may see it, and rightfully so, as a very cheap and deep
+training which brings you together with the experts in the field :)
+
+The money we need for travels and accommodation is estimated to
+sum up around 6000 Euro currently.  If you are a company and paying is easier
+for you to process after an invoice, Holger's company http://merlinux.eu
+can invoice you for the sprint and will channel the funds to the
+sprint budget.  If we get excess money we'll use it for funding
+future sprints.
+

tox.ini

@@ -133,7 +133,7 @@ commands=
 
 
 [testenv:coveralls]
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERALLS_REPO_TOKEN
 usedevelop=True
 basepython=python3.4
 changedir=.
@@ -141,7 +141,7 @@ deps =
     {[testenv]deps}
     coveralls
 commands=
-    coverage run --source=_pytest {envdir}/bin/py.test testing
+    coverage run --source=_pytest -m pytest testing
     coverage report -m
     coveralls