1. devstack
  2. Commit 6b1198b8303c4d3da1a5f96368c85b44c4122c82
Browse code

Don't use packaged unittest2

Let pip install unittest2; pip installation can conflict with the
packaged version.

Cherry-picked from b0595235a2374451c3f899fb893ad989a74b04d1
Partial-Bug: #1430592

Conflicts:
files/rpms-suse/general
files/rpms/general

Change-Id: I08a00b92c3578abfdb0300a37eeda117d4c76e92

Ian Wienand authored on 2015/03/11 10:04:49
Showing 2 changed files
files/rpms-suse/general
History View file @ 6b1198b
... ... 
@@ -14,7 +14,6 @@ psmisc
14 14 
 python-cmd2 # dist:opensuse-12.3
15 15 
 python-pylint
16 16 
 python-setuptools # instead of python-distribute; dist:sle11sp2
17 
-python-unittest2
18 17 
 screen
19 18 
 tar
20 19 
 tcpdump
files/rpms/general
History View file @ 6b1198b
... ... 
@@ -13,7 +13,6 @@ psmisc
13 13 
 pylint
14 14 
 python-setuptools
15 15 
 python-prettytable # dist:rhel6 [1]
16 
-python-unittest2
17 16 
 python-virtualenv
18 17 
 python-devel
19 18 
 screen