From 712898cfe1219301902be6421019c3d1c9f6feef Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 28 Mar 2013 10:21:03 +0100
Subject: [PATCH] - add release announce

---
 _pytest/__init__.py               |  2 +-
 doc/en/announce/release-2.3.5.txt | 59 +++++++++++++++++++++++++++++++
 setup.py                          |  2 +-
 testing/acceptance_test.py        |  2 ++
 tox.ini                           |  3 +-
 5 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 doc/en/announce/release-2.3.5.txt

diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index a203b180d..56e8690af 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.3.5dev6'
+__version__ = '2.3.5.dev8'
diff --git a/doc/en/announce/release-2.3.5.txt b/doc/en/announce/release-2.3.5.txt
new file mode 100644
index 000000000..3025816db
--- /dev/null
+++ b/doc/en/announce/release-2.3.5.txt
@@ -0,0 +1,59 @@
+pytest-2.3.5: bug fixes
+===========================================================================
+
+pytest-2.3.5 is a bug fix release for the pytest testing tool.
+See the changelog below for details.  And 
+
+     http://pytest.org/
+
+for general information.  To install or upgrade pytest:
+
+    pip install -U pytest # or
+    easy_install -U pytest
+
+best,
+holger krekel
+
+
+Changes between 2.3.4 and 2.3.5
+-----------------------------------
+
+- issue 259 - when assertion rewriting, be consistent with the default
+  source encoding of ASCII on Python 2
+
+- issue 251 - report a skip instead of ignoring classes with init
+
+- issue250 unicode/str mixes in parametrization names and values now works
+
+- issue257, assertion-triggered compilation of source ending in a
+  comment line doesn't blow up in python2.5 (fixed through py>=1.4.13)
+
+- fix --genscript option to generate standalone scripts that also
+  work with python3.3 (importer ordering)
+
+- issue171 - in assertion rewriting, show the repr of some
+  global variables
+
+- fix option help for "-k"
+
+- move long description of distribution into README.rst
+
+- improve docstring for metafunc.parametrize()
+
+- fix bug where using capsys with pytest.set_trace() in a test
+  function would break when looking at capsys.readouterr()
+
+- allow to specify prefixes starting with "_" when 
+  customizing python_functions test discovery. (thanks Graham Horler)
+
+- improve PYTEST_DEBUG tracing output by puting
+  extra data on a new lines with additional indent
+
+- ensure OutcomeExceptions like skip/fail have initialized exception attributes
+
+- issue 260 - don't use nose special setup on plain unittest cases
+
+- fix issue134 - print the collect errors that prevent running specified test items
+
+- fix issue266 - accept unicode in MarkEvaluator expressions
+
diff --git a/setup.py b/setup.py
index e989910ef..946495ec6 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.3.5.dev7',
+        version='2.3.5.dev8',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index e61b5070a..1312f9d20 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -505,6 +505,8 @@ class TestDurations:
     source = """
         import time
         frag = 0.02
+        def test_something():
+            pass
         def test_2():
             time.sleep(frag*5)
         def test_1():
diff --git a/tox.ini b/tox.ini
index 95914bce6..a25bd6eef 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 distshare={homedir}/.tox/distshare
 envlist=py25,py26,py27,py27-nobyte,py32,py33,py27-xdist,trial
 indexserver=
-    pypi = http://pypi.python.org/simple
+    pypi = https://pypi.python.org/simple
     testrun = http://pypi.testrun.org
     default = http://pypi.testrun.org
 
@@ -39,7 +39,6 @@ commands=
 
 [testenv:trial]
 changedir=.
-basepython=python2.6
 deps=:pypi:twisted
      :pypi:pexpect
 commands=