From 764bc37ea16b944be2189c242481c6ad86e8715d Mon Sep 17 00:00:00 2001 From: Rob Frawley 2nd Date: Mon, 12 Jun 2017 16:13:24 -0400 Subject: [PATCH] align travis and platform build environments --- .platform.app.yaml | 1 + .travis.yml | 4 ++-- _build/.requirements.txt | 13 ++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.platform.app.yaml b/.platform.app.yaml index bdc4ac462c7..66f6a036b73 100644 --- a/.platform.app.yaml +++ b/.platform.app.yaml @@ -57,4 +57,5 @@ hooks: export PIP_USER= pip install pip==9.0.1 wheel==0.29.0 pip install -r _build/.requirements.txt + find .virtualenv -type f -name "*.rst" -delete make -C _build html diff --git a/.travis.yml b/.travis.yml index bee27c9a7fb..cccb01eef30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ sudo: false cache: directories: [$HOME/.cache/pip] -install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git +install: pip install -r _build/.requirements.txt -script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html +script: make -C _build SPHINXOPTS=-nW html branches: except: diff --git a/_build/.requirements.txt b/_build/.requirements.txt index 80842e2e4b1..4a52e3fcb7e 100644 --- a/_build/.requirements.txt +++ b/_build/.requirements.txt @@ -1,14 +1,13 @@ -alabaster==0.7.9 -Babel==2.3.4 +alabaster==0.7.10 +Babel==2.4.0 docutils==0.13.1 imagesize==0.7.1 -Jinja2==2.9.4 -MarkupSafe==0.23 +Jinja2==2.9.6 +MarkupSafe==1.0 Pygments==2.2.0 -pytz==2016.10 +pytz==2017.2 requests==2.12.5 six==1.10.0 snowballstemmer==1.2.1 -Sphinx==1.5.2 +Sphinx==1.3.6 git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php -