Merge "Remove old excludes"

doc/requirements.txt

@@ -1,12 +1,8 @@
-# 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.
-
 # For generating sphinx documentation
 doc8>=0.6.0 # Apache-2.0
 openstackdocstheme>=2.2.1 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0 # BSD
+sphinx>=2.0.0 # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
 
 # PDF Docs
@@ -19,7 +15,7 @@ testresources>=2.0.0 # Apache-2.0/BSD
 python-memcached>=1.56 # PSF
 WebTest>=2.0.27 # MIT
 oslo.messaging>=5.29.0 # Apache-2.0
-pycadf!=2.0.0,>=1.1.0 # Apache-2.0
+pycadf>=1.1.0 # Apache-2.0
 PyJWT>=2.4.0 # MIT
 keystoneauth1>=3.12.0 # Apache-2.0
 oslo.cache>=1.26.0 # Apache-2.0

requirements.txt

@@ -8,10 +8,10 @@ oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.serialization>=2.18.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
-pycadf!=2.0.0,>=1.1.0 # Apache-2.0
+pbr>=2.0.0 # Apache-2.0
+pycadf>=1.1.0 # Apache-2.0
 PyJWT>=2.4.0 # MIT
 python-keystoneclient>=3.20.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0

test-requirements.txt

@@ -1,7 +1,7 @@
 hacking~=6.0.1 # Apache-2.0
 flake8-docstrings~=1.7.0 # MIT
 
-coverage!=4.4,>=4.0 # Apache-2.0
+coverage>=4.0 # Apache-2.0
 cryptography>=3.0 # BSD/Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
@@ -16,4 +16,4 @@ oslo.messaging>=5.29.0 # Apache-2.0
 PyJWT>=2.4.0 # MIT
 
 # Bandit security code scanner
-bandit!=1.6.0,>=1.1.0 # Apache-2.0
+bandit>=1.1.0 # Apache-2.0