Updated from global requirements

Change-Id: Icf1abab5ac8a56da17d9a6389664d0b4049250e8

requirements.txt

@@ -3,6 +3,6 @@
 # process, which may cause wedges in the gate later.
 appdirs>=1.3.0 # MIT License
 GitPython>=1.0.1 # BSD License (3 clause)
-PyYAML>=3.1.0
-six>=1.9.0
+PyYAML>=3.1.0 # MIT
+six>=1.9.0 # MIT
 stevedore>=1.5.0 # Apache-2.0

test-requirements.txt

@@ -1,16 +1,16 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-coverage>=3.6
-discover
-fixtures>=1.3.1
+coverage>=3.6 # Apache-2.0
+discover # BSD
+fixtures>=1.3.1 # Apache-2.0/BSD
 hacking<0.10,>=0.9.2
-mock>=1.2
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+mock>=1.2 # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-beautifulsoup4
+beautifulsoup4 # MIT