resync requirements with openstack upstream

requirements.txt

@@ -1,7 +1,11 @@
-PyYAML>=3.10
+# The order of packages is significant, because pip processes them in the order
-simplejson>=3.3.1
+# of appearance. Changing the order has an impact on the overall integration
-netifaces>=0.8
+# process, which may cause wedges in the gate later.
-netaddr>=0.7.10
+PyYAML>=3.1.0
-Jinja2>=2.7.2
+simplejson>=2.2.0
-six>=1.5.2
+netifaces>=0.10.4
-dnspython
+netaddr>=0.7.12,!=0.7.16
+Jinja2>=2.6  # BSD License (3 clause)
+six>=1.9.0
+dnspython>=1.12.0
+psutil>=1.1.1,<2.0.0

test-requirements.txt

@@ -1,7 +1,8 @@
-testtools
+# The order of packages is significant, because pip processes them in the order
-coverage
+# of appearance. Changing the order has an impact on the overall integration
-mock
+# process, which may cause wedges in the gate later.
-flake8==2.1.0
+coverage>=3.6
-# No version required
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
 charm-tools
-os-testr