Merge ~cjwatson/lp-source-dependencies:unittest2-1.1.0+lp1 into lp-source-dependencies:master

Proposed by Colin Watson
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
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.__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

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/dist/unittest2-1.1.0+lp1.tar.gz b/dist/unittest2-1.1.0+lp1.tar.gz
2new file mode 100644
3index 0000000..fd8f6d1
4Binary files /dev/null and b/dist/unittest2-1.1.0+lp1.tar.gz differ

Subscribers

People subscribed via source and target branches