Workaround for missing PBR requirement

PBR misses a requirement to testrepository.
This workaround installs it in front and can be removed after
PBR is fixed.

This fix also contains tox fix due to the fact that kilo gate is broken two
times which can't be fixed in two dependent commits:

  Do not fail with Tox 2.3.1

  Latest tox causes failures:
     File "/usr/local/lib/python2.7/dist-packages/tox/config.py", line 1140, in processcommand
      argv = list(shlexer)
     File "/usr/lib/python2.7/shlex.py", line 269, in next
       token = self.get_token()
     File "/usr/lib/python2.7/shlex.py", line 96, in get_token
       raw = self.read_token()
     File "/usr/lib/python2.7/shlex.py", line 172, in read_token
       raise ValueError, "No closing quotation"
   ValueError: No closing quotation

  This is caused by a backwards incompatible change in tox:
  https://bitbucket.org/hpk42/tox/issues/181
  (cherry picked from commit f59e6df23a)

Change-Id: Iddce0260436042e37eebe2aecb810707e53a4473
Partial-Bug: #1530026
This commit is contained in:
Marc Koderer 2016-01-04 09:34:53 +01:00
parent 4dd556f3ee
commit 77e835142a
2 changed files with 11 additions and 7 deletions

View File

@ -129,3 +129,7 @@ fi
# and installing the latest version using pip.
uninstall_package python-virtualenv
pip_install -U virtualenv
# NOTE(mkoderer): PBR has a missing requirement to testrepository
# Can be removed when bug #1530026 is fixed.
pip_install testrepository

14
tox.ini
View File

@ -11,18 +11,18 @@ install_command = pip install {opts} {packages}
deps = bashate
whitelist_externals = bash
commands = bash -c "find {toxinidir} \
-not \( -type d -name .?\* -prune \) \ # prune all 'dot' dirs
-not \( -type d -name doc -prune \) \ # skip documentation
-type f \ # only files
-not -name \*~ \ # skip editors, readme, etc
-not \( -type d -name .?\* -prune \) \
-not \( -type d -name doc -prune \) \
-type f \
-not -name \*~ \
-not -name \*.md \
\( \
-name \*.sh -or \
-name \*rc -or \
-name functions\* -or \
-wholename \*/inc/\* -or \ # /inc files and
-wholename \*/lib/\* \ # /lib files are shell, but
\) \ # have no extension
-wholename \*/inc/\* -or \
-wholename \*/lib/\* \
\) \
-print0 | xargs -0 bashate -v"
[testenv:docs]