Ocata sync
Change-Id: I420d79791ac6ae4bf84164a9fe7ff15eebdde136
This commit is contained in:
parent
0a14dc61bb
commit
434c643d5e
|
@ -14,8 +14,8 @@
|
||||||
import argparse
|
import argparse
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from neutronclient._i18n import _
|
||||||
from neutronclient.common import utils as n_utils
|
from neutronclient.common import utils as n_utils
|
||||||
from neutronclient.i18n import _
|
|
||||||
from neutronclient.neutron import v2_0 as neutronV20
|
from neutronclient.neutron import v2_0 as neutronV20
|
||||||
from neutronclient.v2_0 import client as neutron_client
|
from neutronclient.v2_0 import client as neutron_client
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
|
@ -20,9 +20,9 @@ import os
|
||||||
|
|
||||||
from heatclient.common import template_utils
|
from heatclient.common import template_utils
|
||||||
|
|
||||||
|
from neutronclient._i18n import _
|
||||||
from neutronclient.common import exceptions as exc
|
from neutronclient.common import exceptions as exc
|
||||||
from neutronclient.common import utils as n_utils
|
from neutronclient.common import utils as n_utils
|
||||||
from neutronclient.i18n import _
|
|
||||||
from neutronclient.neutron import v2_0 as neutronV20
|
from neutronclient.neutron import v2_0 as neutronV20
|
||||||
|
|
||||||
from gbpclient.common import utils
|
from gbpclient.common import utils
|
||||||
|
|
|
@ -32,10 +32,10 @@ import six.moves.urllib.parse as urlparse
|
||||||
|
|
||||||
from cliff import app
|
from cliff import app
|
||||||
from cliff import commandmanager
|
from cliff import commandmanager
|
||||||
|
from neutronclient._i18n import _
|
||||||
from neutronclient.common import clientmanager
|
from neutronclient.common import clientmanager
|
||||||
from neutronclient.common import exceptions as exc
|
from neutronclient.common import exceptions as exc
|
||||||
from neutronclient.common import utils
|
from neutronclient.common import utils
|
||||||
from neutronclient.i18n import _
|
|
||||||
from neutronclient.version import __version__
|
from neutronclient.version import __version__
|
||||||
|
|
||||||
from gbpclient.gbp.v2_0 import groupbasedpolicy as gbp
|
from gbpclient.gbp.v2_0 import groupbasedpolicy as gbp
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
# 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.
|
||||||
pbr>=1.6 # Apache-2.0
|
pbr>=1.8 # Apache-2.0
|
||||||
python-heatclient>=0.8.0
|
python-heatclient>=1.6.1
|
||||||
python-neutronclient<6.0.0,>=5.1.0
|
python-neutronclient<6.3.0,>=5.1.0
|
||||||
oslo.serialization>=1.10.0 # Apache-2.0
|
oslo.serialization>=1.10.0 # Apache-2.0
|
||||||
oslo.utils>=3.5.0 # Apache-2.0
|
oslo.utils>=3.18.0 # Apache-2.0
|
||||||
# REVISIT: After mitaka release add dependency on released version of python-neutronclient
|
|
||||||
|
|
|
@ -3,16 +3,18 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
hacking<0.11,>=0.10.0
|
hacking<0.11,>=0.10.0
|
||||||
|
|
||||||
cliff-tablib>=1.0
|
coverage>=4.0 # Apache-2.0
|
||||||
coverage>=3.6 # Apache-2.0
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
fixtures>=1.3.1 # Apache-2.0/BSD
|
mox3!=0.19.0,>=0.7.0 # Apache-2.0
|
||||||
|
mock>=2.0 # BSD
|
||||||
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 # Apache-2.0
|
oslosphinx>=4.7.0 # Apache-2.0
|
||||||
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
|
||||||
oslotest>=1.10.0 # Apache-2.0
|
oslotest>=1.10.0 # Apache-2.0
|
||||||
python-keystoneclient<=3.2.0
|
python-openstackclient>=3.3.0 # Apache-2.0
|
||||||
python-subunit>=0.0.18 # Apache-2.0/BSD
|
python-subunit>=0.0.18 # Apache-2.0/BSD
|
||||||
requests-mock>=0.7.0 # Apache-2.0
|
reno>=1.8.0 # Apache-2.0
|
||||||
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
|
requests-mock>=1.1 # Apache-2.0
|
||||||
|
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
|
||||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||||
testtools>=1.4.0 # MIT
|
testtools>=1.4.0 # MIT
|
||||||
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -26,7 +26,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
commands=
|
commands=
|
||||||
python setup.py build_sphinx
|
sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
# E125 continuation line does not distinguish itself from next logical line
|
# E125 continuation line does not distinguish itself from next logical line
|
||||||
|
|
Loading…
Reference in New Issue