Upgrade fonttools from 3.28.0 to 3.31.0.android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-release

Ran `tools/external_updater/updater.sh update fonttools`.

Bug: N/A
Test: builds
Change-Id: I59a0dfbf4585d3a95d2120d49730321b84c884ff

1 files changed, 21 insertions, 18 deletions

diff --git a/tox.ini b/tox.ini
index cb1ab915..63619e3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,29 +1,24 @@
 [tox]
-envlist = py{27,36}-cov, htmlcov
+minversion = 3.0
+envlist = py{27,37}-cov, htmlcov
 
 [testenv]
-basepython =
-    py27: {env:TOXPYTHON:python2.7}
-    pypy: {env:TOXPYTHON:pypy}
-    py34: {env:TOXPYTHON:python3.4}
-    py35: {env:TOXPYTHON:python3.5}
-    py36: {env:TOXPYTHON:python3.6}
 deps =
     cov: coverage>=4.3
     pytest
     -rrequirements.txt
-install_command =
-    pip install -v {opts} {packages}
+extras =
+    ufo
+    woff
+    unicode
+    interpolatable
+    !nolxml: lxml
 commands =
-    # run the test suite against the package installed inside tox env.
-    # We use parallel mode and then combine later so that coverage.py will take
-    # paths like .tox/py36/lib/python3.6/site-packages/fontTools and collapse
-    # them into Lib/fontTools.
+    # test with or without coverage, passing extra positonal args to pytest
     cov: coverage run --parallel-mode -m pytest {posargs}
-    nocov: pytest {posargs}
+    !cov: pytest {posargs}
 
 [testenv:htmlcov]
-basepython = {env:TOXPYTHON:python3.6}
 deps =
     coverage>=4.3
 skip_install = true
@@ -33,7 +28,6 @@ commands =
 
 [testenv:codecov]
 passenv = *
-basepython = {env:TOXPYTHON:python}
 deps =
     coverage>=4.3
     codecov
@@ -44,7 +38,6 @@ commands =
     codecov --env TOXENV
 
 [testenv:bdist]
-basepython = {env:TOXPYTHON:python3.6}
 deps =
     pygments
     docutils
@@ -60,9 +53,19 @@ commands =
     # check metadata and rst long_description
     python setup.py check --restructuredtext --strict
     # clean up build/ and dist/ folders
-    rm -rf {toxinidir}/dist
+    python -c 'import shutil; shutil.rmtree("dist", ignore_errors=True)'
     python setup.py clean --all
     # build sdist
     python setup.py sdist --dist-dir {toxinidir}/dist
     # build wheel from sdist
     pip wheel -v --no-deps --no-index --wheel-dir {toxinidir}/dist --find-links {toxinidir}/dist fonttools
+
+[testenv:pypi]
+deps =
+    {[testenv:bdist]deps}
+    twine
+skip_install = true
+passenv = TWINE_USERNAME TWINE_PASSWORD
+commands =
+    {[testenv:bdist]commands}
+    twine upload dist/*.whl dist/*.zip