Skip to content

Commit 1fb7194

Browse files
committed
minor #8030 Fix and align travis and platform build environments (robfrawley)
This PR was merged into the 2.7 branch. Discussion ---------- Fix and align travis and platform build environments This pull request fixes the `platform.sh` deploy and aligns the `platform.sh` and `travis-ci.org` build to use the same version constraints and environments. Per @xabbuh in #8009 (comment) this PR has been made against the `2.7` branch. Original implementation pulled from #8010 and #8009. Changes include: - Update the `pip` version requirements pulled in by [_build/.requirements.txt](https://github.com/robfrawley/symfony-docs/blob/feature-align-travis-and-platform-build/_build/.requirements.txt) to latest releases, except for `sphinx` which must be downgraded to `1.3` until we find a solution for `sphinx-php` (which there doesn't seem to be much interest in fixing: #7402 (comment), #7422, fabpot/sphinx-php#33). - Use the same package management and constraint requirements for both `platform.sh` and `travis-ci.org` by having both utilize the `_build/.requirements.txt` file when calling `pip`. - Use the same documentation build command to compile the documentation HTML (`make`) while still calling `sphinx` with "strict mode" (or, more accurately, "turn warnings into errors mode") for `travis-ci.org`. - On `platform.sh`, since the `vitrualenv` folder is at the documentation root, remove all `rst` files contained within it (pulled in from the `pip` packages) via a `find` command, so as to ensure the build doesn't pull them in (they would never appear in the output as they don't exist in the doctree, but if they contain errors or other inconsistencies, this could cause the build to fail while reading in their sources). - `find .virtualenv -type f -name "*.rst" -delete` Commits ------- 764bc37 align travis and platform build environments
2 parents 9879aa6 + 764bc37 commit 1fb7194

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.platform.app.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ hooks:
5757
export PIP_USER=
5858
pip install pip==9.0.1 wheel==0.29.0
5959
pip install -r _build/.requirements.txt
60+
find .virtualenv -type f -name "*.rst" -delete
6061
make -C _build html

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ sudo: false
66
cache:
77
directories: [$HOME/.cache/pip]
88

9-
install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
9+
install: pip install -r _build/.requirements.txt
1010

11-
script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
11+
script: make -C _build SPHINXOPTS=-nW html
1212

1313
branches:
1414
except:

_build/.requirements.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
alabaster==0.7.9
2-
Babel==2.3.4
1+
alabaster==0.7.10
2+
Babel==2.4.0
33
docutils==0.13.1
44
imagesize==0.7.1
5-
Jinja2==2.9.4
6-
MarkupSafe==0.23
5+
Jinja2==2.9.6
6+
MarkupSafe==1.0
77
Pygments==2.2.0
8-
pytz==2016.10
8+
pytz==2017.2
99
requests==2.12.5
1010
six==1.10.0
1111
snowballstemmer==1.2.1
12-
Sphinx==1.5.2
12+
Sphinx==1.3.6
1313
git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
14-

0 commit comments

Comments
 (0)