Merge ~cjwatson/lp-source-dependencies:unittest2-1.1.0+lp1 into lp-source-dependencies:master
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | ce8b409b4d6103be1b9ad0a0dc683d0da11293da |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/lp-source-dependencies:unittest2-1.1.0+lp1 |
Merge into: | lp-source-dependencies:master |
Diff against target: |
4 lines (+0/-0) 0 files modified
|
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tom Wardill (community) | Approve | ||
Review via email: mp+379682@code.launchpad.net |
Commit message
Add unittest2 1.1.0+lp1
Description of the change
This just copies the version number directly into setup.py rather than trying to load it lazily from unittest2.
The complete diff is as follows:
diff -ru unittest2-
--- unittest2-
+++ unittest2-
@@ -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://
Author: Robert Collins
diff -ru unittest2-
--- unittest2-
+++ unittest2-
@@ -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)
-VERSION = late_version()
+VERSION = '1.1.0+lp1'
NAME = 'unittest2'
diff -ru unittest2-
--- unittest2-
+++ unittest2-
@@ -31,7 +31,7 @@
-__version__ = '1.1.0'
+__version__ = '1.1.0+lp1'
# Expose obsolete functions for backwards compatibility
__all_
diff -ru unittest2-
--- unittest2-
+++ unittest2-
@@ -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://
Author: Robert Collins