From 236250f1c3e9f328f0dc23ab168afbcfa639a33b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 23 Mar 2018 08:27:57 -0500 Subject: [PATCH] Rename python-openstacksdk to openstacksdk Change-Id: Ia77163f330f674146b369dfebea56bd97820057e Depends-On: https://review.openstack.org/554662 --- doc/source/plugin-registry.rst | 2 +- inc/python | 6 ------ lib/libraries | 2 +- stackrc | 10 +++++----- tests/test_libs_from_pypi.sh | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/doc/source/plugin-registry.rst b/doc/source/plugin-registry.rst index 04b7698fbd..a5d3ff28c6 100644 --- a/doc/source/plugin-registry.rst +++ b/doc/source/plugin-registry.rst @@ -147,13 +147,13 @@ oaktree `git://git.openstack.org/openstack/oaktre octavia `git://git.openstack.org/openstack/octavia `__ octavia-dashboard `git://git.openstack.org/openstack/octavia-dashboard `__ omni `git://git.openstack.org/openstack/omni `__ +openstacksdk `git://git.openstack.org/openstack/openstacksdk `__ os-xenapi `git://git.openstack.org/openstack/os-xenapi `__ osprofiler `git://git.openstack.org/openstack/osprofiler `__ oswin-tempest-plugin `git://git.openstack.org/openstack/oswin-tempest-plugin `__ panko `git://git.openstack.org/openstack/panko `__ patrole `git://git.openstack.org/openstack/patrole `__ picasso `git://git.openstack.org/openstack/picasso `__ -python-openstacksdk `git://git.openstack.org/openstack/python-openstacksdk `__ qinling `git://git.openstack.org/openstack/qinling `__ rally `git://git.openstack.org/openstack/rally `__ rally-openstack `git://git.openstack.org/openstack/rally-openstack `__ diff --git a/inc/python b/inc/python index e074ea498f..ec4233b156 100644 --- a/inc/python +++ b/inc/python @@ -411,12 +411,6 @@ function use_library_from_git { function lib_installed_from_git { local name=$1 local safe_name - # TODO(mordred) This is a special case for python-openstacksdk, where the - # repo name and the pip name do not match. We should either add systemic - # support for providing aliases, or we should rename the git repo. - if [[ $name == 'python-openstacksdk' ]] ; then - name=openstacksdk - fi safe_name=$(python -c "from pkg_resources import safe_name; \ print(safe_name('${name}'))") # Note "pip freeze" doesn't always work here, because it tries to diff --git a/lib/libraries b/lib/libraries index 6d52f642a1..52ec784d3b 100644 --- a/lib/libraries +++ b/lib/libraries @@ -28,6 +28,7 @@ GITDIR["cliff"]=$DEST/cliff GITDIR["cursive"]=$DEST/cursive GITDIR["debtcollector"]=$DEST/debtcollector GITDIR["futurist"]=$DEST/futurist +GITDIR["openstacksdk"]=$DEST/openstacksdk GITDIR["os-client-config"]=$DEST/os-client-config GITDIR["osc-lib"]=$DEST/osc-lib GITDIR["osc-placement"]=$DEST/osc-placement @@ -51,7 +52,6 @@ GITDIR["oslo.versionedobjects"]=$DEST/oslo.versionedobjects GITDIR["oslo.vmware"]=$DEST/oslo.vmware GITDIR["osprofiler"]=$DEST/osprofiler GITDIR["pycadf"]=$DEST/pycadf -GITDIR["python-openstacksdk"]=$DEST/python-openstacksdk GITDIR["stevedore"]=$DEST/stevedore GITDIR["taskflow"]=$DEST/taskflow GITDIR["tooz"]=$DEST/tooz diff --git a/stackrc b/stackrc index e8c35f423e..f05bc6ec3a 100644 --- a/stackrc +++ b/stackrc @@ -133,7 +133,7 @@ export USE_PYTHON3=$(trueorfalse False USE_PYTHON3) # base name of the directory from which they are installed. See # enable_python3_package to edit this variable and use_python3_for to # test membership. -export ENABLED_PYTHON3_PACKAGES="nova,glance,cinder,uwsgi,python-openstackclient,python-openstacksdk" +export ENABLED_PYTHON3_PACKAGES="nova,glance,cinder,uwsgi,python-openstackclient,openstacksdk" # Explicitly list services not to run under Python 3. See # disable_python3_package to edit this variable. @@ -525,6 +525,10 @@ GITREPO["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_REPO:-${GIT_BASE}/opensta GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-$TARGET_BRANCH} GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware +# openstacksdk OpenStack Python SDK +GITREPO["openstacksdk"]=${OPENSTACKSDK_REPO:-${GIT_BASE}/openstack/openstacksdk.git} +GITBRANCH["openstacksdk"]=${OPENSTACKSDK_BRANCH:-$TARGET_BRANCH} + # os-brick library to manage local volume attaches GITREPO["os-brick"]=${OS_BRICK_REPO:-${GIT_BASE}/openstack/os-brick.git} GITBRANCH["os-brick"]=${OS_BRICK_BRANCH:-$TARGET_BRANCH} @@ -542,10 +546,6 @@ GITBRANCH["os-vif"]=${OS_VIF_BRANCH:-$TARGET_BRANCH} GITREPO["osc-lib"]=${OSC_LIB_REPO:-${GIT_BASE}/openstack/osc-lib.git} GITBRANCH["osc-lib"]=${OSC_LIB_BRANCH:-$TARGET_BRANCH} -# python-openstacksdk OpenStack Python SDK -GITREPO["python-openstacksdk"]=${OPENSTACKSDK_REPO:-${GIT_BASE}/openstack/python-openstacksdk.git} -GITBRANCH["python-openstacksdk"]=${OPENSTACKSDK_BRANCH:-$TARGET_BRANCH} - # ironic common lib GITREPO["ironic-lib"]=${IRONIC_LIB_REPO:-${GIT_BASE}/openstack/ironic-lib.git} GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-$TARGET_BRANCH} diff --git a/tests/test_libs_from_pypi.sh b/tests/test_libs_from_pypi.sh index a544b56577..c3b4457171 100755 --- a/tests/test_libs_from_pypi.sh +++ b/tests/test_libs_from_pypi.sh @@ -38,7 +38,7 @@ ALL_LIBS+=" oslo.versionedobjects oslo.vmware keystonemiddleware" ALL_LIBS+=" oslo.serialization" ALL_LIBS+=" python-openstackclient osc-lib osc-placement" ALL_LIBS+=" os-client-config oslo.rootwrap" -ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient" +ALL_LIBS+=" oslo.i18n oslo.utils openstacksdk python-swiftclient" ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy" ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service" ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive"