Commit357b2dc

committed

use virtualenv for platform.sh and use make and requirements for travis

1 parentc49d427 commit357b2dcCopy full SHA for 357b2dc

File tree

+11

-10

lines changed

+11

-10

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,18 +43,16 @@ web:`
`43`	`43`	`# The size of the persistent disk of the application (in MB).`
`44`	`44`	`disk:512`
`45`	`45`
`46`		`-# Build time dependencies.`
`47`	`46`	`dependencies:`
`48`	`47`	`python:`
`49`	`48`	`virtualenv:15.1.0`
`50`	`49`
`51`	`50`	`# The hooks that will be performed when the package is deployed.`
`52`	`51`	`hooks:`
`53`	`52`	`build:\|`
`54`		`- virtualenv .virtualenv`
`55`		`- . .virtualenv/bin/activate`
`56`		`- # Platform.sh currently sets PIP_USER=1.`
`57`		`- export PIP_USER=`
`58`		`- pip install pip==9.0.1 wheel==0.29.0`
`59`		`- pip install -r requirements.txt`
`60`		`- make -C _build html`
	`53`	`+ virtualenv .venv`
	`54`	`+ . .venv/bin/activate`
	`55`	`+ export PIP_USER=`
	`56`	`+ pip install pip==9.0.1 wheel==0.29.0`
	`57`	`+ pip install -r _build/.requirements.txt`
	`58`	`+ make -C _build html`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ sudo: false`
`6`	`6`	`cache:`
`7`	`7`	`directories:[$HOME/.cache/pip]`
`8`	`8`
`9`		`-install:pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git`
	`9`	`+install:pip install-r _build/.requirements.txtsphinx==1.3.0`
`10`	`10`
`11`		`-script:sphinx-build -nW -c _build/ -b html -d_build/doctrees . _build/html`
	`11`	`+script:SPHINXOPTS="-nW" make -eC_buildhtml`
`12`	`12`
`13`	`13`	`branches:`
`14`	`14`	`except:`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+git+https://github.com/fabpot/sphinx-php.git@master#egg_name=sphinx-php`

Comments

(0)