merge

HOWTORELEASE.rst

@@ -2,11 +2,11 @@
 How to release pytest (draft)
 --------------------------------------------
 
-1. bump version numbers in setup.py and pytest/__init__.py
+1. bump version numbers in pytest/__init__.py (setup.py reads it)
 
 2. check and finalize CHANGELOG
 
-3. write doc/en/announce/pytest-VERSION.txt and include
+3. write doc/en/announce/release-VERSION.txt and include
    it in doc/en/announce/index.txt
 
 4. use devpi for uploading a release tarball to a staging area:
@@ -15,7 +15,7 @@ How to release pytest (draft)
 
 5. run from multiple machines:
    - ``devpi use https://devpi.net/USER/dev`` 
-   - ``devpi test pytest-VERSION``
+   - ``devpi test pytest==VERSION``
 
 6. check that tests pass for relevant combinations with
    ``devpi list pytest`` 
@@ -25,14 +25,15 @@ How to release pytest (draft)
    which is ok (tox does not support skipping on
    per-platform basis yet).
 
-7. XXX "regen docs" (not easy to do currently as it requires
-   a development version of the regendoc tool from ronny)
+7. Regenerate the docs using the toplevel makefile::
+      make docs
 
-8. go to "doc/en" and upload docs with "make install"
-   (the latter requires ssh-login permissions on pytest.org 
-   because it uses rsync).  Note that the "install" target of
-   doc/en/Makefile defines where the rsync goes to, typically
-   to the "latest" section of pytest.org.
+8. Upload the docs using the toplevel makefile::
+      make upload-docs
+   This requires ssh-login permission on pytest.org because it uses
+   rsync.
+   Note that the "install" target of doc/en/Makefile defines where the
+   rsync goes to, typically to the "latest" section of pytest.org.
 
 9. publish to pypi "devpi push pytest-2.6.2 pypi:NAME" where NAME 
    is the name of pypi.python.org as configured in your 

doc/en/announce/index.txt

@@ -5,6 +5,8 @@ Release announcements
 .. toctree::
    :maxdepth: 2
 
+   release-2.7.1
+   release-2.7.0
    release-2.6.3
    release-2.6.2
    release-2.6.1

doc/en/announce/release-2.7.1.txt

@@ -0,0 +1,58 @@
+pytest-2.7.1: bug fixes
+=======================
+
+pytest is a mature Python testing tool with more than a 1100 tests
+against itself, passing on many different interpreters and platforms.
+This release is supposed to be drop-in compatible to 2.7.0.
+
+See below for the changes and see docs at:
+
+    http://pytest.org
+
+As usual, you can upgrade from pypi via::
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+    Bruno Oliveira
+    Holger Krekel
+    Ionel Maries Cristian
+    Floris Bruynooghe
+
+Happy testing,
+The py.test Development Team
+
+
+2.7.1 (compared to 2.7.0)
+-------------------------
+
+- fix issue731: do not get confused by the braces which may be present
+  and unbalanced in an object's repr while collapsing False
+  explanations.  Thanks Carl Meyer for the report and test case.
+
+- fix issue553: properly handling inspect.getsourcelines failures in
+  FixtureLookupError which would lead to to an internal error,
+  obfuscating the original problem. Thanks talljosh for initial
+  diagnose/patch and Bruno Oliveira for final patch.
+
+- fix issue660: properly report scope-mismatch-access errors
+  independently from ordering of fixture arguments.  Also
+  avoid the pytest internal traceback which does not provide
+  information to the user. Thanks Holger Krekel.
+
+- streamlined and documented release process.  Also all versions
+  (in setup.py and documentation generation) are now read
+  from _pytest/__init__.py. Thanks Holger Krekel.
+
+- fixed docs to remove the notion that yield-fixtures are experimental.
+  They are here to stay :)  Thanks Bruno Oliveira.
+
+- Support building wheels by using environment markers for the
+  requirements.  Thanks Ionel Maries Cristian.
+
+- fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing
+  when tests raised SystemExit. Thanks Holger Krekel.
+
+- reintroduced _pytest fixture of the pytester plugin which is used
+  at least by pytest-xdist.

doc/en/example/markers.txt

@@ -55,8 +55,8 @@ Or the inverse, running all tests except the webtest ones::
     ================= 1 tests deselected by "-m 'not webtest'" =================
     ================== 3 passed, 1 deselected in 0.01 seconds ==================
 
-Selecing tests based on their node ID
--------------------------------------
+Selecting tests based on their node ID
+--------------------------------------
 
 You can provide one or more :ref:`node IDs <node-id>` as positional
 arguments to select only specified tests. This makes it easy to select