diff --git a/requirements.txt b/requirements.txt index 79ecccce..595250ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,6 @@ # process, which may cause wedges in the gate later. pbr>=1.6 # Apache-2.0 -Babel>=2.3.4 # BSD -requests>=2.10.0 # Apache-2.0 os-brick>=1.6.1 # Apache-2.0 oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 oslo.concurrency>=3.8.0 # Apache-2.0 @@ -12,9 +10,8 @@ oslo.utils>=3.17.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=3.11.0 # Apache-2.0 pylxd>=2.1.1 # Apache-2.0 -pyOpenSSL>=0.14 # Apache-2.0 # XXX: rockstar (17 Feb 2016) - oslo_config imports # debtcollector, which imports this, but doesn't # require it in dependencies. -wrapt>=1.7.0 # BSD License +#wrapt>=1.7.0 # BSD License diff --git a/setup.cfg b/setup.cfg index 0564a92e..418772c0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,19 +15,15 @@ classifier = Programming Language :: Python Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 - Programming Language :: Python :: 2.6 - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.3 - Programming Language :: Python :: 3.4 [files] packages = - nova/virt/lxd - nova/tests + nova/virt/lxd + nova/tests [entry_points] tempest.test_plugins = - nova-lxd-tempest-plugin = nova_lxd_tempest_plugin.plugin:MyPlugin + nova-lxd-tempest-plugin = nova_lxd_tempest_plugin.plugin:MyPlugin [build_sphinx] source-dir = doc/source @@ -36,17 +32,3 @@ all_files = 1 [upload_sphinx] upload-dir = doc/build/html - -[compile_catalog] -directory = nova_lxd/locale -domain = nova_lxd - -[update_catalog] -domain = nova_lxd -output_dir = nova_lxd/locale -input_file = nova_lxd/locale/nova_lxd.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext -mapping_file = babel.cfg -output_file = nova_lxd/locale/nova_lxd.pot