From 7629f595188411b264027c17f4f3fc96ed440fc9 Mon Sep 17 00:00:00 2001 From: Trevor McKay Date: Wed, 12 Mar 2014 11:57:40 -0400 Subject: [PATCH] Change packaging references to python-saharaclient Now that the git repo has been renamed, all references to the project in the packaging code have been changed to 'saharaclient'. It will now install as python-saharaclient but still retains /usr/bin/savanna and site-packages/savannaclient for legacy code support. Partial-implements: blueprint savanna-renaming-client Change-Id: Ib1d3022dffb2fa7319dd51ecad6c6d7072915472 --- run_tests.sh | 2 +- saharaclient/shell.py | 2 +- saharaclient/version.py | 2 +- setup.cfg | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 31a67b7f..f5ebe5bc 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -4,7 +4,7 @@ set -eu function usage { echo "Usage: $0 [OPTION]..." - echo "Run python-savannaclient test suite" + echo "Run python-saharaclient test suite" echo "" echo " -V, --virtual-env Always use virtualenv. Install automatically if not present" echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment" diff --git a/saharaclient/shell.py b/saharaclient/shell.py index 6f0664b1..95b81906 100644 --- a/saharaclient/shell.py +++ b/saharaclient/shell.py @@ -435,7 +435,7 @@ class OpenStackSavannaShell(object): def _discover_via_python_path(self): for (module_loader, name, _ispkg) in pkgutil.iter_modules(): - if name.endswith('_python_savannaclient_ext'): + if name.endswith('_python_saharaclient_ext'): if not hasattr(module_loader, 'load_module'): # Python 2.6 compat: actually get an ImpImporter obj module_loader = module_loader.find_module(name) diff --git a/saharaclient/version.py b/saharaclient/version.py index 0291078f..a1a76c5a 100644 --- a/saharaclient/version.py +++ b/saharaclient/version.py @@ -15,4 +15,4 @@ from pbr import version -version_info = version.VersionInfo('python-savannaclient') +version_info = version.VersionInfo('python-saharaclient') diff --git a/setup.cfg b/setup.cfg index a6dbee67..5a3040fb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] -name = python-savannaclient +name = python-saharaclient summary = Client library for Sahara API description-file = README.rst license = Apache License, Version 2.0 author = OpenStack author-email = openstack-dev@lists.openstack.org -home-page = https://github.com/stackforge/python-savannaclient +home-page = https://github.com/openstack/python-saharaclient classifier = Environment :: OpenStack Intended Audience :: Information Technology