Skip to content

Commit 479510a

Browse files
committed
use cmd recipe to easy_install pygments into the docutils venv
remove pip part, which was failing to install pygments in the venv build sphinx last to avoid having the Pygments it fetches prevent the venv from getting one too. remove pin references to distribute now that we are on the post-merge setuptools
1 parent 0f20e18 commit 479510a

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

buildout.cfg

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
#
44
[buildout]
55
parts =
6-
sphinx
76
venv
8-
pip
7+
venv-pygments
98
build_s5
109
executable
10+
sphinx
1111

1212
allow-picked-versions = true
1313
show-picked-versions = true
@@ -31,15 +31,10 @@ eggs =
3131

3232
[venv]
3333
recipe = rjm.recipe.venv
34+
venv_options = --no-site-packages
3435
distutils_urls =
3536
http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz
3637

37-
[pip]
38-
recipe = gp.recipe.pip
39-
virtualenv = ${buildout:directory}
40-
install = Pygments
41-
42-
4338
[build_s5]
4439
recipe = collective.recipe.template[genshi]:genshi
4540
input = ${buildout:script-in}
@@ -55,10 +50,20 @@ on_update = true
5550
cmds =
5651
chmod 744 ${build_s5:output}
5752

53+
# manually install Pygments into the distutils venv so it will be there for
54+
# colorizing slide code examples.
55+
[venv-pygments]
56+
recipe = collective.recipe.cmd
57+
on_install = true
58+
on_update = false
59+
cmds =
60+
${buildout:directory}/bin/easy_install Pygments
61+
62+
5863
[versions]
5964
# pin versions for continued sanity
6065
Jinja2 = 2.6
61-
Pygments = 1.5
66+
Pygments = 1.6
6267
Sphinx = 1.1.3
6368
collective.recipe.sphinxbuilder = 0.7.1
6469
roman = 1.4.0
@@ -75,19 +80,12 @@ zc.buildout = 1.5.2
7580
#collective.recipe.sphinxbuilder 0.7.1
7681
zc.recipe.egg = 1.3.2
7782

78-
# distribute = 0.6.30
79-
8083
Genshi = 0.6
8184
collective.recipe.cmd = 0.5
8285
collective.recipe.template = 1.9
8386
rjm.recipe.venv = 0.8
8487

85-
#Required by:
86-
#collective.recipe.sphinxbuilder 0.7.1
87-
#zc.recipe.egg 1.3.2
88-
#zc.buildout 1.5.2
89-
# setuptools = 0.6c12dev-r88846
9088

9189
#Required by:
9290
#rjm.recipe.venv 0.8
93-
virtualenv = 1.8.2
91+
virtualenv = 1.10

0 commit comments

Comments
 (0)