From 5a13f31bce4f594b05bf67af84689ff8a3b15e6d Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 16 Dec 2013 18:07:05 +0100 Subject: [PATCH] fix issue407: fix addoption docstring to point to argparse instead of optparse. Thanks Daniel D. Wright. --- CHANGELOG | 4 ++++ _pytest/__init__.py | 2 +- _pytest/config.py | 4 ++-- setup.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 30d48a2fd..7fb5dbbdb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,10 @@ Unreleased - fix issue404 by always using the binary xml escape in the junitxml plugin. Thanks Ronny Pfannschmidt. +- fix issue407: fix addoption docstring to point to argparse instead of + optparse. Thanks Daniel D. Wright. + + 2.5.0 ----------------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index cd2436106..06da340f7 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.5.0' +__version__ = '2.5.1' diff --git a/_pytest/config.py b/_pytest/config.py index ab6018e4e..c04ae44a9 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -128,8 +128,8 @@ class Parser: :opts: option names, can be short or long options. :attrs: same attributes which the ``add_option()`` function of the - `optparse library - `_ + `argparse library + `_ accepts. After command line parsing options are available on the pytest config diff --git a/setup.py b/setup.py index 5d2e7ffc8..6ef9d4852 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.5.0', + version='2.5.1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],