Merge pull request #2016 from daspecster/switch-to-tox-for-json-docs

Switch to using tox for calling json docs update script
googleapis · Jul 22, 2016 · aa17477 · aa17477
2 parents ba6b13c + d6291ad
commit aa17477
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ script:
   - tox -e lint
   - tox -e system-tests
   - tox -e system-tests3
-  - scripts/update_json_docs.sh
+  - tox -e json-docs
 
 after_success:
   - tox -e coveralls

diff --git a/tox.ini b/tox.ini
@@ -112,11 +112,18 @@ basepython =
     python2.7
 commands =
     python -c "import shutil; shutil.rmtree('docs/_build/json', ignore_errors=True)"
-    python scripts/generate_json_docs.py
+    {toxinidir}/scripts/update_json_docs.sh
 deps =
     parinx
     pdoc
     Sphinx
+passenv =
+    TRAVIS_TAG
+    TRAVIS_BRANCH
+    TRAVIS_PULL_REQUEST
+    GH_OWNER
+    GH_OAUTH_TOKEN
+    GH_PROJECT_NAME
 setenv =
     PYTHONPATH = {toxinidir}/_testing