From 6168ca7a8969a094cd65a71d68018e5fb148c05f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 23 Mar 2018 08:33:21 -0500
Subject: [PATCH] Rename python-openstacksdk to openstacksdk
Depends-On: https://review.openstack.org/554662
Change-Id: I6169f9e98418055c7c3ae5bc3b76b1216703cd55
---
.zuul.yaml | 10 +++++-----
tox.ini | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.zuul.yaml b/.zuul.yaml
index 29702ddb4f..49dbe2d664 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,10 +8,10 @@
required-projects:
- openstack/cliff
- openstack/keystoneauth
+ - openstack/openstacksdk
- openstack/os-client-config
- openstack/osc-lib
- openstack/python-openstackclient
- - openstack/python-openstacksdk
vars:
tox_envlist: py27
# Set work dir to openstackclient so that if it's triggered by one of the
@@ -30,10 +30,10 @@
required-projects:
- openstack/cliff
- openstack/keystoneauth
+ - openstack/openstacksdk
- openstack/os-client-config
- openstack/osc-lib
- openstack/python-openstackclient
- - openstack/python-openstacksdk
vars:
# Set work dir to openstackclient so that if it's triggered by one of the
# other repos the tests will run in the same place
@@ -51,10 +51,10 @@
required-projects:
- openstack/cliff
- openstack/keystoneauth
+ - openstack/openstacksdk
- openstack/os-client-config
- openstack/osc-lib
- openstack/python-openstackclient
- - openstack/python-openstacksdk
vars:
# Set work dir to openstackclient so that if it's triggered by one of the
# other repos the tests will run in the same place
@@ -155,14 +155,14 @@
required-projects:
- openstack/cliff
- openstack/keystoneauth
+ - openstack/openstacksdk
- openstack/os-client-config
- openstack/osc-lib
- openstack/python-openstackclient
- - openstack/python-openstacksdk
vars:
devstack_localrc:
USE_PYTHON3: true
- LIBS_FROM_GIT: python-openstackclient,python-openstacksdk,osc-lib,os-client-config
+ LIBS_FROM_GIT: python-openstackclient,openstacksdk,osc-lib,os-client-config
# This is insufficient, but leaving it here as a reminder of what may
# someday be all we need to make this work
# disable_python3_package swift
diff --git a/tox.ini b/tox.ini
index c56c3fbf0c..7ba2f2191d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,7 @@ commands =
pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
- pip install -q -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
+ pip install -q -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
pip freeze
stestr run {posargs}
whitelist_externals = stestr
@@ -82,7 +82,7 @@ commands =
pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
- pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
+ pip install -q -U -e "git+file://{toxinidir}/../openstacksdk#egg=openstacksdk"
pip freeze
{toxinidir}/openstackclient/tests/functional/run_stestr.sh {posargs}