Browse code

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

I also picked up a bit of https://review.openstack.org/#/c/236778/ but
tried to not get the worst of it (i.e., the new checks that would require
a lot more back-porting to stable/liberty).

Change-Id: Ic28c634cf806394cfa82b61cb45be60b8f40a61a
(cherry picked from commit f59e6df23a430f0622215fec5bbbe18cfe7fee9c)

Davanum Srinivas authored on 2015/12/21 22:36:40
Showing 1 changed files
... ...
@@ -8,23 +8,25 @@ usedevelop = False
8 8
 install_command = pip install {opts} {packages}
9 9
 
10 10
 [testenv:bashate]
11
-deps = bashate
11
+deps =
12
+   {env:BASHATE_INSTALL_PATH:bashate==0.3.1}
12 13
 whitelist_externals = bash
13 14
 commands = bash -c "find {toxinidir}             \
14
-         -not \( -type d -name .?\* -prune \)    \ # prune all 'dot' dirs
15
-         -not \( -type d -name doc -prune \)     \ # skip documentation
16
-         -not \( -type d -name shocco -prune \)  \ # skip shocco
17
-         -type f                                 \ # only files
18
-         -not -name \*~                          \ # skip editors, readme, etc
15
+         -not \( -type d -name .?\* -prune \)    \
16
+         -not \( -type d -name doc -prune \)     \
17
+         -not \( -type d -name shocco -prune \)  \
18
+         -type f                                 \
19
+         -not -name \*~                          \
19 20
          -not -name \*.md                        \
20 21
          \(                                      \
21 22
           -name \*.sh -or                        \
23
+          -name \*.orig -or                      \
22 24
           -name \*rc -or                         \
23 25
           -name functions\* -or                  \
24
-          -wholename \*/inc/\* -or               \ # /inc files and
25
-          -wholename \*/lib/\*                   \ # /lib files are shell, but
26
-         \)                                      \ #   have no extension
27
-         -print0 | xargs -0 bashate -v"
26
+          -wholename \*/inc/\* -or               \
27
+          -wholename \*/lib/\*                   \
28
+         \)                                      \
29
+         -print0 | xargs -0 bashate -v -iE006"
28 30
 
29 31
 [testenv:docs]
30 32
 deps =