Finished release 0.3.

Author: htgoebel

.gitignore

@@ -42,6 +42,7 @@
 *.egg-link
 
 /nosetests.xml
+/.cache
 /.coverage
 /.tox
 /.achievements

AUTHORS.txt

@@ -0,0 +1,32 @@
+Contributors
+==============
+
+The number im front of each name denotes the number of commits by the
+respective contributor.
+
+
+Contributors for v0.3
+------------------------
+
+     6  Guilherme Quentel Melo <[email protected]>
+     3  Adam Chainz <[email protected]>
+     3  Ronny Pfannschmidt <[email protected]>
+     1  Hartmut Goebel <[email protected]>
+
+
+Contributors for v0.2
+------------------------
+
+    17  Hartmut Goebel <[email protected]>
+
+
+Contributors for v0.1
+------------------------
+
+    36  Hartmut Goebel <[email protected]>
+
+..
+ Local Variables:
+ ispell-local-dictionary: "american"
+ coding: utf-8
+ End:

CHANGES.rst

@@ -1,11 +1,24 @@
 Changelog
 ============
 
+v0.3 (2016-07-26)
+----------------
+
+* Add support for assertRaises / assertWarns context managers.
+
+* Add support for converting lambda arguments in assertRaises into
+  context managers.
+
+* Fix some incorrect transformations.
+
+* Internal cleanup and fixes.
+
+
 v0.2 (2015-10-20)
 ---------------------
 
-* Add support assertRegex/assertRegexpMatches, assertNotRegex
-  assertRaisesRegex/assertRaisesRegexp assertWarnsRegex.
+* Add support for assertRegex/assertRegexpMatches, assertNotRegex,
+  assertRaisesRegex/assertRaisesRegexp, assertWarnsRegex.
 
 * `unittest2pytest` is now a `pytest` subproject.
 

MANIFEST.in

@@ -0,0 +1,7 @@
+include CHANGES.rst
+include COPYING-GPLv3.txt
+include README.rst
+
+recursive-include tests *
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]

README.rst

@@ -7,14 +7,15 @@ Helps converting unittest test-cases to pytest
 -----------------------------------------------------
 
 :Author:    Hartmut Goebel <[email protected]>
-:Version:   Version 0.2
+:Version:   Version 0.3
 :Copyright: Hartmut Goebel
 :Licence:   GNU Public Licence v3 or later (GPLv3+)
 :Homepage:  https://github.com/pytest-dev/unittest2pytest
 
 
-.. image:: https://secure.travis-ci.org/pytest-dev/unittest2pytest.png?branch=master
+.. image:: https://img.shields.io/travis/pytest-dev/unittest2pytest/v0.3.svg
    :target: https://travis-ci.org/pytest-dev/unittest2pytest/
+   :alt: Travis CI test status
 
 
 `unittest2pytest` is a tool that helps rewriting Python `unittest`
@@ -75,8 +76,15 @@ A list of the available fixers can be found with the following::
     self_assert
 
 
+Note: if your tests use the context managers ``with self.assertRaises`` or
+``with self.assertWarns``, they will be transformed to ``pytest.raises`` or
+``pytest.warns`` appropriately, but because the semantics are different, any
+use of the output value from the context managers (e.g. the ``x`` in
+``with pytest.raises(ValueError) as x:``) will be wrong and will require
+manual adjustment after the fact.
+
 .. _`lib2to3 documentation`: http://docs.python.org/library/2to3.html
-.. _pytest: http://www.python.org/dev/peps/pep-0008/
+.. _pytest: https://pytest.org/latest/
 
 
 ..

setup.cfg

@@ -0,0 +1,2 @@
+[zest.releaser]
+python-file-with-version = unittest2pytest/__init__.py

setup.py

@@ -21,8 +21,20 @@
 
 from setuptools import setup
 import codecs
+import re
 import sys
-import unittest2pytest
+
+
+def get_version(filename):
+    """
+    Return package version as listed in `__version__` in `filename`.
+    """
+    init_py = open(filename).read()
+    return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
+
+
+version = get_version('unittest2pytest/__init__.py')
+
 
 def read(filename):
     try:
@@ -38,7 +50,7 @@ def read(filename):
 setup(
     name="unittest2pytest",
     license='GPLv3+',
-    version=unittest2pytest.__version__,
+    version=version,
     description="Convert unittest test-cases to pytest",
     long_description=long_description,
     author="Hartmut Goebel",

tests/fixtures/self_assert/assertDictEqual_in.py

@@ -9,3 +9,15 @@ def test_simple_msg(self):
 
     def test_simple_msg2(self):
         self.assertDictEqual(klm, 100, "This is wrong!")
+
+    def test_line_wrapping(self):
+        self.assertDictEqual(
+            {
+                'a': 1,
+                'b': 2,
+            },
+            {'b': 2},
+            "This is wrong!",
+        )
+
+        self.assertDictEqual(100, klm)

tests/fixtures/self_assert/assertDictEqual_out.py

@@ -9,3 +9,13 @@ def test_simple_msg(self):
 
     def test_simple_msg2(self):
         assert klm == 100, "This is wrong!"
+
+    def test_line_wrapping(self):
+        assert {
+                'a': 1,
+                'b': 2,
+            } == \
+            {'b': 2}, \
+            "This is wrong!"
+
+        assert 100 == klm

tests/fixtures/self_assert/assertEqual_in.py

@@ -14,3 +14,22 @@ def test_everybody(self):
     def test_message(self):
         self.assertEqual(123+z, xxx+y, msg='This is wrong!')
         self.assertEqual(123, xxx+y, 'This is wrong!')
+
+    def test_line_wrapping(self):
+        self.assertEqual(True, False, 'This will fail %s' %
+                'always')
+
+        self.assertEqual(
+
+                         'abc'
+                         .replace(
+                                  'abc'
+                                  , 'def'),
+                         'def',
+                         msg='Wrap %s' %
+                         'everything')
+
+    def test_expression_as_argument(self):
+        self.assertEqual(abc not in self.data, True)
+        self.assertEqual(abc in self.data, not contains)
+        self.assertEqual(contains, not contains)