Sync with stable liberty
Change-Id: I43f320c2305108404540fa29e46c0bae4f80276c
This commit is contained in:
@@ -16,7 +16,7 @@ import logging
|
|||||||
from neutronclient.common import utils as n_utils
|
from neutronclient.common import utils as n_utils
|
||||||
from neutronclient.i18n import _
|
from neutronclient.i18n import _
|
||||||
from neutronclient.neutron import v2_0 as neutronV20
|
from neutronclient.neutron import v2_0 as neutronV20
|
||||||
from oslo.serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from gbpclient.common import utils
|
from gbpclient.common import utils
|
||||||
|
|
||||||
|
@@ -27,7 +27,7 @@ from keystoneclient.auth.identity import v3 as v3_auth
|
|||||||
from keystoneclient import discover
|
from keystoneclient import discover
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
|
from keystoneclient.openstack.common.apiclient import exceptions as ks_exc
|
||||||
from keystoneclient import session
|
from keystoneclient import session
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
import six.moves.urllib.parse as urlparse
|
import six.moves.urllib.parse as urlparse
|
||||||
|
|
||||||
from cliff import app
|
from cliff import app
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
# The order of packages is significant, because pip processes them in the order
|
# 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
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
python-heatclient>=0.4.0,<0.5
|
python-heatclient>=0.8.0
|
||||||
|
python-neutronclient>=3.0.0
|
||||||
|
@@ -1,19 +1,18 @@
|
|||||||
# The order of packages is significant, because pip processes them in the order
|
# 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
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
python-neutronclient>=2.4.0,<2.5
|
|
||||||
hacking>=0.9.2,<0.10
|
hacking>=0.9.2,<0.10
|
||||||
|
|
||||||
cliff-tablib>=1.0
|
cliff-tablib>=1.0
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
discover
|
discover
|
||||||
fixtures>=0.3.14
|
fixtures>=1.3.1
|
||||||
httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
|
httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
|
||||||
mox3>=0.7.0
|
mox3>=0.7.0
|
||||||
oslosphinx>=2.2.0.0a2
|
oslosphinx>=2.5.0 # Apache-2.0
|
||||||
oslotest>=1.1.0.0a2
|
oslotest>=1.10.0 # Apache-2.0
|
||||||
python-subunit>=0.0.18
|
python-subunit>=0.0.18
|
||||||
sphinx>=1.1.2,!=1.2.0,<1.3
|
requests-mock>=0.6.0 # Apache-2.0
|
||||||
|
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18
|
||||||
testscenarios>=0.4
|
testtools>=1.4.0
|
||||||
testtools>=0.9.34
|
|
||||||
|
Reference in New Issue
Block a user