Updated from global requirements

Change-Id: I5a1c10c88c8fe402955888caafca229710776142

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.
-pbr<2.0,>=0.11
+pbr<2.0,>=1.3
 
 beautifulsoup4
 iso8601>=0.1.9
 six>=1.9.0
 PyYAML>=3.1.0
 
-oslo.log>=1.2.0 # Apache-2.0
-semantic_version>=2.3.1
+oslo.log>=1.6.0 # Apache-2.0
+semantic-version>=2.3.1
 
 # not listed in global requirements
-yaql>=0.2.6,<0.3 # Apache 2.0 License
+yaql!=0.3.0,>=0.2.7 # Apache 2.0 License
 python-muranoclient>=0.5.6

setup.py

@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.3'],
     pbr=True)

test-requirements.txt

@@ -12,8 +12,7 @@ nosehtmloutput>=0.0.3
 selenium
 
 testtools>=1.4.0
-mock>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 mox3>=0.7.0
 
 # Docs Requirements