Skip to content

Fix Platform.sh Build #7402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/_build/doctrees
/_build/html
/.venv/
/.idea/
*.pyc
11 changes: 7 additions & 4 deletions .platform.app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

@robfrawley robfrawley Jan 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@javiereguiluz The requirement of 1.3.0 for TravisCI is due to the following warning (turned into error) that halts the build due to sphinx-php overwriting code-block using sphinx versions greater than 1.3:

Warning, treated as error:
WARNING: while setting up extension sensio.sphinx.codeblock: directive 'code-block' is already registered, it will be overridden

We may need to re-think the use of -nW opts for Travis runs, as this is incompatible with newer versions of Sphinx (which throw a warning on overridden directives), and this will become a problem at some point (as we begin to reply on newer features and need to run newer versions).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I've turned this comment into a proper issue (#7422) to not lose track of it.


script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
script: SPHINXOPTS="-nW" make -eC _build html

branches:
except:
Expand Down
1 change: 1 addition & 0 deletions _build/.requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
git+https://github.com/fabpot/sphinx-php.git@master#egg_name=sphinx-php