Merge branch 'release/0.4.8'

flupke · May 6, 2015 · 9997560 · 9997560
2 parents 84c6864 + c161d2e
commit 9997560
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/freezerequirements/utils.py b/freezerequirements/utils.py
@@ -208,7 +208,13 @@ def build_wheel(pip, source_archive):
     Return the wheel package filename.
     '''
     wheel_dir = create_work_dir()
-    pip.wheel('--no-deps', source_archive, wheel_dir=wheel_dir)
+
+    # On newer versions of pip, we get a traceback when running "pip wheel" on
+    # unittest2, we need to ignore the error to trigger the workaround below.
+    try:
+        pip.wheel('--no-deps', source_archive, wheel_dir=wheel_dir)
+    except sh.ErrorReturnCode:
+        pass
 
     # "pip wheel" fails on unittest2 because they use a stupid custom class
     # instead of a string for the version number in setup.py; pip does not set

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 
 
-version = '0.4.7'
+version = '0.4.8'
 
 install_requires = [
     'click',