Merge pull request #2927 from nicoddemus/release-3.2.5

Release 3.2.5

CHANGELOG.rst

@@ -8,6 +8,17 @@
 
 .. towncrier release notes start
 
+Pytest 3.2.5 (2017-11-15)
+=========================
+
+Bug Fixes
+---------
+
+- Remove ``py<1.5`` restriction from ``pytest`` as this can cause version
+  conflicts in some installations. (`#2926
+  <https://github.com/pytest-dev/pytest/issues/2926>`_)
+
+
 Pytest 3.2.4 (2017-11-13)
 =========================
 
@@ -28,6 +39,8 @@ Bug Fixes
   failed example in the docstring is < 9. (`#2882
   <https://github.com/pytest-dev/pytest/issues/2882>`_)
 
+- Match fixture paths against actual path segments in order to avoid matching folders which share a prefix.
+  (`#2836 <https://github.com/pytest-dev/pytest/issues/2836>`_)
 
 Improved Documentation
 ----------------------

changelog/2836.bug

@@ -1 +0,0 @@
-Match fixture paths against actual path segments in order to avoid matching folders which share a prefix.

doc/en/announce/index.rst

@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
    
+   release-3.2.5
    release-3.2.4
    release-3.2.3
    release-3.2.2

doc/en/announce/release-3.2.5.rst

@@ -0,0 +1,18 @@
+pytest-3.2.5
+=======================================
+
+pytest 3.2.5 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+  
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Bruno Oliveira
+
+
+Happy testing,
+The pytest Development Team

setup.py

@@ -43,7 +43,7 @@ def has_environment_marker_support():
 
 
 def main():
-    install_requires = ['py>=1.4.33,<1.5', 'setuptools']  # pluggy is vendored in _pytest.vendored_packages
+    install_requires = ['py>=1.4.33', 'setuptools']  # pluggy is vendored in _pytest.vendored_packages
     extras_require = {}
     if has_environment_marker_support():
         extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict']