launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-source-dependencies:unittest2-1.1.0+lp1 into lp-source-dependencies:master.

Commit message:
Add unittest2 1.1.0+lp1

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/379682

This just copies the version number directly into setup.py rather than trying to load it lazily from unittest2.__version__, allowing us to build a wheel.  See https://github.com/pypa/setuptools/issues/409.

The complete diff is as follows:

diff -ru unittest2-1.1.0/PKG-INFO unittest2-1.1.0+lp1/PKG-INFO
--- unittest2-1.1.0/PKG-INFO    2015-06-30 07:48:20.000000000 +0100
+++ unittest2-1.1.0+lp1/PKG-INFO        2020-02-21 23:39:07.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: unittest2
-Version: 1.1.0
+Version: 1.1.0+lp1
 Summary: The new features in unittest backported to Python 2.4+.
 Home-page: http://pypi.python.org/pypi/unittest2
 Author: Robert Collins
diff -ru unittest2-1.1.0/setup.py unittest2-1.1.0+lp1/setup.py
--- unittest2-1.1.0/setup.py    2015-06-30 07:47:44.000000000 +0100
+++ unittest2-1.1.0+lp1/setup.py        2020-02-21 23:38:59.000000000 +0000
@@ -10,15 +10,7 @@
 import os
 import sys

-class late_version:
-    def __str__(self):
-        from unittest2 import __version__ as VERSION
-        return VERSION
-    def __add__(self, other):
-        return str(self) + other
-    def replace(self, old, new):
-        return str(self).replace(old, new)
-VERSION = late_version()
+VERSION = '1.1.0+lp1'

 NAME = 'unittest2'

diff -ru unittest2-1.1.0/unittest2/__init__.py unittest2-1.1.0+lp1/unittest2/__init__.py
--- unittest2-1.1.0/unittest2/__init__.py       2015-06-30 07:47:26.000000000 +0100
+++ unittest2-1.1.0+lp1/unittest2/__init__.py   2020-02-21 23:38:47.000000000 +0000
@@ -31,7 +31,7 @@
            'defaultTestLoader', 'SkipTest', 'skip', 'skipIf', 'skipUnless',
            'expectedFailure', 'TextTestResult', '__version__', 'collector']

-__version__ = '1.1.0'
+__version__ = '1.1.0+lp1'

 # Expose obsolete functions for backwards compatibility
 __all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases'])
diff -ru unittest2-1.1.0/unittest2.egg-info/PKG-INFO unittest2-1.1.0+lp1/unittest2.egg-info/PKG-INFO
--- unittest2-1.1.0/unittest2.egg-info/PKG-INFO 2015-06-30 07:48:20.000000000 +0100
+++ unittest2-1.1.0+lp1/unittest2.egg-info/PKG-INFO     2020-02-21 23:39:07.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: unittest2
-Version: 1.1.0
+Version: 1.1.0+lp1
 Summary: The new features in unittest backported to Python 2.4+.
 Home-page: http://pypi.python.org/pypi/unittest2
 Author: Robert Collins
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-source-dependencies:unittest2-1.1.0+lp1 into lp-source-dependencies:master.

diff --git a/dist/unittest2-1.1.0+lp1.tar.gz b/dist/unittest2-1.1.0+lp1.tar.gz
new file mode 100644
index 0000000..fd8f6d1
Binary files /dev/null and b/dist/unittest2-1.1.0+lp1.tar.gz differ