Skip to content

Commit

Permalink
Correct pinning for Plone3.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
woutervh committed Jan 3, 2012
1 parent 2987663 commit 3f4967a
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 12 deletions.
4 changes: 3 additions & 1 deletion buildout.cfg
@@ -1,5 +1,7 @@
[buildout]
extends = test-plone-4.0.x.cfg
extends =
# test-plone-4.0.x.cfg
test-plone-3.3.x.cfg


parts +=
Expand Down
10 changes: 5 additions & 5 deletions docs/Makefile
Expand Up @@ -3,14 +3,14 @@

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SPHINXBUILD = /opt/zope/Products.EasyNewsletter/bin/zopepy /opt/zope/Products.EasyNewsletter/bin/sphinx-build
PAPER =
BUILDDIR = build
BUILDDIR = /opt/zope/Products.EasyNewsletter/docs

# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) /opt/zope/Products.EasyNewsletter/docs/source

.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest

Expand Down Expand Up @@ -61,9 +61,9 @@ qthelp:
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/EasyNewsletter.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/sphinxbuilder.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/EasyNewsletter.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/sphinxbuilder.qhc"

latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
Expand Down
4 changes: 2 additions & 2 deletions docs/make.bat
Expand Up @@ -3,8 +3,8 @@
REM Command file for Sphinx documentation

set SPHINXBUILD=sphinx-build
set BUILDDIR=/home/timo/workspace/plone/Products.EasyNewsletter/docs
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% /home/timo/workspace/plone/Products.EasyNewsletter/docs/source
set BUILDDIR=/opt/zope/Products.EasyNewsletter/docs
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% /opt/zope/Products.EasyNewsletter/docs/source
if NOT "%PAPER%" == "" (
set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
)
Expand Down
7 changes: 6 additions & 1 deletion test-plone-3.3.x.cfg
Expand Up @@ -22,15 +22,19 @@ eggs +=
Sphinx-PyPI-upload
repoze.sphinx.autointerface
Products.PdbDebugMode
# Products.PrintingMailHost
# Products.PrintingMailHost
plone.reload
Products.MaildropHost


[versions]
collective.recipe.sphinxbuilder = 0.6.3.3
Products.CMFPlone = 4.0b1
plone.app.testing = 3.0a1
plone.reload = 1.5
plone.testing = 3.0a2
Sphinx = 0.6.6
#unittest2 = 0.5.1


[omelette]
Expand Down Expand Up @@ -109,3 +113,4 @@ initialization =
exclude = '--omit=' + '${buildout:package-directory}/tests/*'
include = '--include=' + '${buildout:package-directory}/*.py'
sys.argv = sys.argv[:] + ['html', '-i', include, exclude]

8 changes: 5 additions & 3 deletions test-plone-4.0.x.cfg
Expand Up @@ -7,14 +7,15 @@ package-directory = Products/EasyNewsletter

parts +=
omelette
zopepy
zopepy
sphinxbuilder
test
coverage
coveragereport
coveragereport
coveragereport-xml
coveragereport-html


[instance]
eggs +=
Sphinx
Expand All @@ -25,11 +26,12 @@ eggs +=
plone.reload
Products.MaildropHost


[versions]
Sphinx = 0.6.6
collective.recipe.sphinxbuilder = 0.6.3.3


[omelette]
recipe = collective.recipe.omelette
eggs = ${instance:eggs}
Expand Down

0 comments on commit 3f4967a

Please sign in to comment.