Merge "Remove deprecated --experimental option of autopep8"
diff --git a/tools/format.sh b/tools/format.sh
index ef5cc92..9685cdf 100755
--- a/tools/format.sh
+++ b/tools/format.sh
@@ -15,7 +15,7 @@
# isort is not compatible with the default flake8 (H306), maybe flake8-isort
# isort -rc -sl -fss ../tempest ../setup.py
-$AUTOPEP8 --exit-code --max-line-length=79 --experimental --in-place \
+$AUTOPEP8 --exit-code --max-line-length=79 --in-place \
-r ../tempest ../setup.py
ERROR=$?
diff --git a/tox.ini b/tox.ini
index ab5d189..84dd978 100644
--- a/tox.ini
+++ b/tox.ini
@@ -389,7 +389,7 @@
{[testenv]deps}
autopep8>=2.1.0
commands =
- autopep8 --exit-code --max-line-length=79 --experimental --diff -r tempest setup.py
+ autopep8 --exit-code --max-line-length=79 --diff -r tempest setup.py
flake8 {posargs}
check-uuid