Merge lp:~jayvdb/testscenarios/0.4 into lp:~testtools-committers/testscenarios/trunk

[John Vandenberg]

Brings launchpad version up to date with released version.

[Robert Collins (lifeless)]

I've pushed up a pypy release snapshot, no idea why it wasn't in bzr before.

=== modified file 'NEWS'
--- NEWS	2012-04-04 10:46:52 +0000
+++ NEWS	2015-04-26 04:47:16 +0000
@@ -6,10 +6,19 @@
 IN DEVELOPMENT
 ~~~~~~~~~~~~~~
 
+0.4
+~~~
+
+IMPROVEMENTS
+------------
+
+* Python 3.2 support added. (Robert Collins)
+
 0.3
 ~~~
 
-CHANGES:
+CHANGES
+-------
 
 * New function ``per_module_scenarios`` for tests that should be applied across 
   multiple modules providing the same interface, some of which may not be 
@@ -22,7 +31,8 @@
 0.2
 ~~~
 
-CHANGES:
+CHANGES
+-------
 
 * Adjust the cloned tests ``shortDescription`` if one is present. (Ben Finney)
 
@@ -32,7 +42,8 @@
 0.1
 ~~~
 
-CHANGES:
+CHANGES
+-------
 
 * Created project. The primary interfaces are
   ``testscenarios.TestWithScenarios`` and
@@ -43,11 +54,3 @@
   Also various presentation and language touchups. (Martin Pool)
   (Adjusted to use doctest directly, and to not print the demo runners
   output to stderror during make check - Robert Collins)
-
-IMPROVEMENTS:
-
-BUG FIXES:
-
-API CHANGES:
-
-INTERNALS:

=== modified file 'lib/testscenarios/__init__.py'
--- lib/testscenarios/__init__.py	2012-04-04 10:46:52 +0000
+++ lib/testscenarios/__init__.py	2015-04-26 04:47:16 +0000
@@ -38,7 +38,7 @@
 # established at this point, and setup.py will use a version of next-$(revno).
 # If the releaselevel is 'final', then the tarball will be major.minor.micro.
 # Otherwise it is major.minor.micro~$(revno).
-__version__ = (0, 3, 0, 'final', 0)
+__version__ = (0, 4, 0, 'final', 0)
 
 __all__ = [
     'TestWithScenarios',

=== modified file 'lib/testscenarios/scenarios.py'
--- lib/testscenarios/scenarios.py	2015-04-26 04:47:16 +0000
+++ lib/testscenarios/scenarios.py	2015-04-26 04:47:16 +0000
@@ -43,7 +43,7 @@
     :param test: The test to apply the scenario to. This test is unaltered.
     :return: A new test cloned from test, with the scenario applied.
     """
-    (name, parameters) = scenario
+    name, parameters = scenario
     scenario_suffix = '(' + name + ')'
     newtest = clone_test_with_new_id(test,
         test.id() + scenario_suffix)

=== modified file 'setup.py'
--- setup.py	2015-04-26 04:47:16 +0000
+++ setup.py	2015-04-26 04:47:16 +0000
@@ -1,13 +1,12 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 import os.path
 
-description = open(os.path.join(os.path.dirname(__file__),
-                                'README'), 'rb').read().decode("utf-8")
+description = open(os.path.join(os.path.dirname(__file__), 'README'), 'rt').read()
 
 setup(name="testscenarios",
-      version="0.3",
+      version="0.4",
       description="Testscenarios, a pyunit extension for dependency injection",
       long_description=description,
       maintainer="Robert Collins",
@@ -22,7 +21,11 @@
           'License :: OSI Approved :: Apache Software License',
           'Operating System :: OS Independent',
           'Programming Language :: Python',
+          'Programming Language :: Python :: 3',
           'Topic :: Software Development :: Quality Assurance',
           'Topic :: Software Development :: Testing',
           ],
+      install_requires = [
+        'testtools',
+        ]
       )