diff options
| author | eeldill <elod.illes@ericsson.com> | 2018-05-02 14:36:01 +0200 |
|---|---|---|
| committer | eeldill <elod.illes@ericsson.com> | 2018-05-03 11:14:40 +0200 |
| commit | cfa6b9ae4986bf5ced2f8f197719fc78152a83f9 (patch) | |
| tree | f9843fb8e2e3d09d3da769c0b57893ccca272c94 | |
| parent | c8dff4fd0d423029eee45b11c16058126f3e7f80 (diff) | |
| download | tooz-cfa6b9ae4986bf5ced2f8f197719fc78152a83f9.tar.gz | |
Fix sphinx-docs job for stable branch1.60.1
build-openstack-sphinx-docs jobs fail on stable branches due to the new
pip version 10 introduces some previously Warning as Error: in case of
calling "pip install" without any package name, the command fails.
tox_install.sh is called during docs job without any package passed to pip.
Change-Id: I860a8776bb32e8e05abd914110ca8df24d869bd2
| -rw-r--r-- | doc/source/conf.py | 2 | ||||
| -rwxr-xr-x | tools/tox_install.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 2d26f1f..c04e7e7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -64,7 +64,7 @@ copyright = u'%s, OpenStack Foundation' % datetime.date.today().year # The short X.Y version. version = subprocess.Popen(['sh', '-c', 'cd ../..; python setup.py --version'], stdout=subprocess.PIPE).stdout.read() -version = version.strip() +version = str(version).strip() # The full version, including alpha/beta/rc tags. release = version diff --git a/tools/tox_install.sh b/tools/tox_install.sh index e61b63a..05c58b3 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -26,5 +26,10 @@ pip install -c"$localfile" openstack-requirements # install will be constrained and we need to unconstrain it. edit-constraints "$localfile" -- "$CLIENT_NAME" +if [ -z "$@" ]; then + echo "No packages to be installed." + exit 0 +fi + pip install -c"$localfile" -U "$@" exit $? |