From 8ead251b36cb13e0968d136577de86f04ac56b54 Mon Sep 17 00:00:00 2001 From: Rob Frawley 2nd Date: Sun, 22 Jan 2017 13:48:47 -0500 Subject: [PATCH] use virtualenv for platform.sh and use make and requirements for travis --- .gitignore | 2 ++ .platform.app.yaml | 11 +++++++---- .travis.yml | 4 ++-- _build/.requirements.txt | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 _build/.requirements.txt diff --git a/.gitignore b/.gitignore index a5eb433eea3..2d31a1c7ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /_build/doctrees /_build/html +/.venv/ +/.idea/ *.pyc diff --git a/.platform.app.yaml b/.platform.app.yaml index cdbe76b0de2..584bb98d2e4 100644 --- a/.platform.app.yaml +++ b/.platform.app.yaml @@ -43,13 +43,16 @@ web: # The size of the persistent disk of the application (in MB). disk: 512 -# Build time dependencies. dependencies: python: - sphinx: "1.3.6" + virtualenv: "15.1" # The hooks that will be performed when the package is deployed. hooks: build: | - pip install git+https://github.com/fabpot/sphinx-php.git - make -C _build html + virtualenv .venv + . .venv/bin/activate + export PIP_USER= + pip install pip==9.0.1 wheel==0.29.0 + pip install -r _build/.requirements.txt + make -C _build html diff --git a/.travis.yml b/.travis.yml index bee27c9a7fb..5df77abb9c6 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 sphinx==1.3.0 -script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html +script: SPHINXOPTS="-nW" make -eC _build html branches: except: diff --git a/_build/.requirements.txt b/_build/.requirements.txt new file mode 100644 index 00000000000..e937a458d8a --- /dev/null +++ b/_build/.requirements.txt @@ -0,0 +1 @@ +git+https://github.com/fabpot/sphinx-php.git@master#egg_name=sphinx-php