Commite7206c5

committed

Merge branch '2.7' into 2.8

* 2.7: Pin Python dependencies and install them in a virtualenv

2 parents4cbb891 +8146f89 commite7206c5Copy full SHA for e7206c5

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,15 @@ disk: 512`
`46`	`46`	`# Build time dependencies.`
`47`	`47`	`dependencies:`
`48`	`48`	`python:`
`49`		`-sphinx:"1.3.6"`
	`49`	`+virtualenv:15.1.0`
`50`	`50`
`51`	`51`	`# The hooks that will be performed when the package is deployed.`
`52`	`52`	`hooks:`
`53`	`53`	`build:\|`
`54`		`- pip install git+https://github.com/fabpot/sphinx-php.git`
	`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`
`55`	`60`	`make -C _build html`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+alabaster==0.7.9`
	`2`	`+Babel==2.3.4`
	`3`	`+docutils==0.13.1`
	`4`	`+imagesize==0.7.1`
	`5`	`+Jinja2==2.9.4`
	`6`	`+MarkupSafe==0.23`
	`7`	`+Pygments==2.2.0`
	`8`	`+pytz==2016.10`
	`9`	`+requests==2.12.5`
	`10`	`+six==1.10.0`
	`11`	`+snowballstemmer==1.2.1`
	`12`	`+Sphinx==1.5.2`
	`13`	`+git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php`
	`14`	`+`

Comments

(0)