diff --git a/_pytest/__init__.py b/_pytest/__init__.py index b3c35201c..1d5eb258a 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.4.1.dev1' +__version__ = '2.4.1' diff --git a/doc/en/announce/release-2.4.1.txt b/doc/en/announce/release-2.4.1.txt new file mode 100644 index 000000000..64ba170f8 --- /dev/null +++ b/doc/en/announce/release-2.4.1.txt @@ -0,0 +1,25 @@ +pytest-2.4.1: fixing three regressions compared to 2.3.5 +=========================================================================== + +pytest-2.4.1 is a quick follow up release to fix three regressions +compared to 2.3.5 before they hit more people: + +- When using parser.addoption() unicode arguments to the + "type" keyword should also be converted to the respective types. + thanks Floris Bruynooghe, @dnozay. (fixes issue360 and issue362) + +- fix dotted filename completion when using argcomplete + thanks Anthon van der Neuth. (fixes issue361) + +- fix regression when a 1-tuple ("arg",) is used for specifying + parametrization (the values of the parametrization were passed + nested in a tuple). Thanks Donald Stufft. + +- also merge doc typo fixes, thanks Andy Dirnberger + +as usual, docs at http://pytest.org and upgrades via:: + + pip install -U pytest + +have fun, +holger krekel diff --git a/doc/en/conf.py b/doc/en/conf.py index e3a00b69b..4f7ccee4f 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -17,7 +17,8 @@ # # The full version, including alpha/beta/rc tags. # The short X.Y version. -version = release = "2.4.0" +version = "2.4.1" +release = "2.4.1" import sys, os diff --git a/setup.py b/setup.py index 43b8cc433..76a9837f5 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.4.1.dev1', + version='2.4.1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],