8000 update travis build to match platform.sh build · symfony/symfony-docs@ab7dcdb · GitHub
[go: up one dir, main page]

Skip to content

Commit ab7dcdb

Browse files
committed
update travis build to match platform.sh build
1 parent 6f9a9c6 commit ab7dcdb

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
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: 7 additions & 8 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
13-
git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
14-
12+
Sphinx==1.3.6
13+
git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php

service_container/expression_language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ to another service: ``AppBundle\Mailer``. One way to do this is with an expressi
2828
AppBundle\Mail\MailerConfiguration: ~
2929
3030
AppBundle\Mailer:
31-
arguments: ['@=service("AppBundle\Mail\MailerConfiguration").getMailerMethod()']
31+
arguments: ["@=service('AppBundle\\Mail\\MailerConfiguration').getMailerMethod()"]
3232
3333
.. code-block:: xml
3434

0 commit comments

Comments
 (0)
0