From f0125449880949e733c5f2b482a708cd3f89cc92 Mon Sep 17 00:00:00 2001 From: vikaschoudhary16 Date: Mon, 18 Jul 2016 13:01:51 +0530 Subject: [PATCH] Update setup.cfg for kuryr-libnetwork This patch updates setup.cfg for kuryr-libnetwork. Partially Implements blueprint common-code-drop Change-Id: I24b1a38717eaa5706341e2b0ad10791904cfb155 --- requirements.txt | 2 +- setup.cfg | 23 ++++++++--------------- tools/tox_install.sh | 3 ++- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 828eec05..67183ae3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ python-neutronclient>=4.2.0 # Apache-2.0 pyroute2>=0.4.3 # Apache-2.0 (+ dual licensed GPL2) os-client-config>=1.13.1 # Apache-2.0 neutron-lib>=0.2.0 # Apache-2.0 --e git+https://github.com/vikaschoudhary16/kuryr.git@drop_libnet_specific_code#egg=kuryr +-e git+https://github.com/vikaschoudhary16/kuryr.git@drop_libnet_specific_code#egg=kuryr-lib diff --git a/setup.cfg b/setup.cfg index b668a91d..2f5bc866 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = kuryr +name = kuryr-libnetwork version = 0.1.0 summary = Docker libnetwork driver for OpenStack Neutron description-file = @@ -22,22 +22,15 @@ classifier = [entry_points] oslo.config.opts = - kuryr = kuryr.opts:list_kuryr_opts + kuryr = kuryr_libnetwork.opts:list_kuryr_opts console_scripts = - kuryr-server = kuryr.server:start + kuryr-server = kuryr_libnetwork.server:start [files] packages = kuryr data_files = - libexec/kuryr = - usr/libexec/kuryr/bridge - usr/libexec/kuryr/iovisor - usr/libexec/kuryr/midonet - usr/libexec/kuryr/ovs - usr/libexec/kuryr/tap - usr/libexec/kuryr/unbound /usr/lib/docker/plugins/kuryr = etc/kuryr.spec [build_sphinx] @@ -49,15 +42,15 @@ all_files = 1 upload-dir = doc/build/html [compile_catalog] -directory = kuryr/locale +directory = kuryr_libnetwork/locale domain = kuryr [update_catalog] -domain = kuryr -output_dir = kuryr/locale -input_file = kuryr/locale/kuryr.pot +domain = kuryr_libnetwork +output_dir = kuryr_libnetwork/locale +input_file = kuryr_libnetwork/locale/kuryr.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = kuryr/locale/kuryr.pot +output_file = kuryr_libnetwork/locale/kuryr.pot diff --git a/tools/tox_install.sh b/tools/tox_install.sh index 465cf4f9..cba4fb35 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -37,7 +37,8 @@ elif [ -x "$ZUUL_CLONER" ]; then else echo "PIP HARDCODE" > /tmp/tox_install.txt pip install -U -egit+https://git.openstack.org/openstack/neutron#egg=neutron + pip install -U -egit+https://git.openstack.org/openstack/kuryr#egg=kuryr fi -pip install -U $* +pip install -U $* --process-dependency-links --allow-all-external exit $?