summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkong wei <kong.wei2@zte.com.cn>2017-03-06 01:28:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-06 01:28:31 +0000
commit3756b89c9bdd1274b1784750253485416920d8b6 (patch)
tree2260aa8bd77c9c17e0524089c1f77eb10c1efac1
parent639460b74df6e282b46e6e391d3f62fe13a78499 (diff)
parent4d83093923afb9feb3372d993f1743a715bf7640 (diff)
Merge "The code using 'python-escalatorclient' as the client's package name. But the true name is 'escalatorclient'. Now, when the shell command 'escalator' was run, the system said: Exception: Versioning for this project requires either an sdist tarball, or access to an upstream git repository. It's also possible that there is a mismatch between the package name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name python-escalatorclient was given, but was not able to be found."
-rw-r--r--client/doc/source/conf.py2
-rw-r--r--client/doc/source/man/escalator.rst2
-rw-r--r--client/escalatorclient/__init__.py2
-rw-r--r--client/escalatorclient/common/http.py2
-rw-r--r--client/run_tests.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/client/doc/source/conf.py b/client/doc/source/conf.py
index 1cfaad2..0e00ed1 100644
--- a/client/doc/source/conf.py
+++ b/client/doc/source/conf.py
@@ -28,7 +28,7 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = 'python-escalatorclient'
+project = 'escalatorclient'
copyright = u'OpenStack Foundation'
# If true, '()' will be appended to :func: etc. cross-reference text.
diff --git a/client/doc/source/man/escalator.rst b/client/doc/source/man/escalator.rst
index 40536ec..bb90ac1 100644
--- a/client/doc/source/man/escalator.rst
+++ b/client/doc/source/man/escalator.rst
@@ -84,4 +84,4 @@ BUGS
====
escalator client is hosted in Launchpad so you can view current bugs at
-https://bugs.launchpad.net/python-escalatorclient/.
+https://bugs.launchpad.net/escalatorclient/.
diff --git a/client/escalatorclient/__init__.py b/client/escalatorclient/__init__.py
index 4b95f8a..8d43a42 100644
--- a/client/escalatorclient/__init__.py
+++ b/client/escalatorclient/__init__.py
@@ -23,7 +23,7 @@ except ImportError:
import pbr.version
-version_info = pbr.version.VersionInfo('python-escalatorclient')
+version_info = pbr.version.VersionInfo('escalatorclient')
try:
__version__ = version_info.version_string()
diff --git a/client/escalatorclient/common/http.py b/client/escalatorclient/common/http.py
index 301eedb..36a2157 100644
--- a/client/escalatorclient/common/http.py
+++ b/client/escalatorclient/common/http.py
@@ -45,7 +45,7 @@ if not hasattr(parse, 'parse_qsl'):
osprofiler_web = importutils.try_import("osprofiler.web")
LOG = logging.getLogger(__name__)
-USER_AGENT = 'python-escalatorclient'
+USER_AGENT = 'escalatorclient'
CHUNKSIZE = 1024 * 64 # 64kB
diff --git a/client/run_tests.sh b/client/run_tests.sh
index 80edda6..ff7d278 100644
--- a/client/run_tests.sh
+++ b/client/run_tests.sh
@@ -2,7 +2,7 @@
function usage {
echo "Usage: $0 [OPTION]..."
- echo "Run python-escalatorclient's test suite(s)"
+ echo "Run escalatorclient's test suite(s)"
echo ""
echo " -p, --pep8 Just run flake8"
echo " -h, --help Print this usage message"