Merge "move tox jobs and I18n tools to Python3"
This commit is contained in:
commit
b1fb77ac6c
|
@ -56,7 +56,7 @@ EOF
|
|||
echo -n "| " >> $LANG_INDEX
|
||||
HAS_LANG=1
|
||||
get_lang_name_prog=$(dirname $0)/get-lang-display-name.py
|
||||
name=`python $get_lang_name_prog $language`
|
||||
name=`python3 $get_lang_name_prog $language`
|
||||
echo "\`$name <__BASE__/${language}/__INDEX__>\`__" >> $LANG_INDEX
|
||||
done
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ fi
|
|||
TMPFILE=`mktemp`
|
||||
trap "rm -f $TMPFILE" EXIT
|
||||
|
||||
python tools/zanata/zanata_users.py --output-file $TMPFILE
|
||||
python3 tools/zanata/zanata_users.py --output-file $TMPFILE
|
||||
if ! diff -u $TEAM_LIST $TMPFILE; then
|
||||
set -x
|
||||
cat <<EOF
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -4,6 +4,7 @@ envlist = docs,pep8
|
|||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
basepython=python3
|
||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||
usedevelop = True
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
|
@ -62,7 +63,6 @@ max-line-length = 80
|
|||
ignore = D000
|
||||
|
||||
[testenv:lower-constraints]
|
||||
basepython = python3
|
||||
deps =
|
||||
-c{toxinidir}/lower-constraints.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
|
Loading…
Reference in New Issue