Skip to content

Commit dd811cf

Browse files
author
Danielle Madeley
committed
Merge branch 'master' into subunit-output
2 parents 697e21b + 39f6118 commit dd811cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+4253
-107
lines changed

Makefile

+4-6
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ integration: clean
2424
@nosetests --stop -s --verbosity=2 tests/integration
2525

2626
doctest: clean
27-
@find specs -name '*.md' -exec steadymark {} \;
27+
@cd docs && make doctest
2828

2929
documentation:
30-
@markment --theme=flat-ui -o ./_public specs
30+
@cd docs && make html
3131

3232
clean:
3333
@printf "Cleaning up files that are already in .gitignore... "
@@ -41,14 +41,12 @@ withdraw-documentation:
4141

4242
deploy-documentation:documentation withdraw-documentation
4343
@printf 'Deploying documentation to http://lettuce.it ...'
44-
@cd ./_public && tar -zcp * | ssh [email protected] "tar zxp -C ./lettuce.it/public/"
44+
@cd ./docs/_build/html && tar -zcp * | ssh [email protected] "tar zxp -C ./lettuce.it/public/"
4545
@echo "DONE!"
4646

4747
deploy: deploy-documentation
4848

49-
release:
50-
@./.release
51-
@make clean unit functional integration doctest deploy-documentation publish
49+
release: clean unit functional integration doctest deploy-documentation publish
5250
@printf "Exporting to $(filename)... "
5351
@tar czf $(filename) lettuce setup.py README.md COPYING
5452
@echo "DONE!"

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# lettuce
2-
> Version 0.2.16 - kryptonite
2+
> Version 0.2.19 - kryptonite
33
44
[![Build Status](https://secure.travis-ci.org/gabrielfalcao/lettuce.png)](http://travis-ci.org/gabrielfalcao/lettuce)
5+
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/gabrielfalcao/lettuce/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
56

67
## On release names
78

@@ -33,7 +34,7 @@ all them are used within lettuce tests
3334
> mkvirtualenv lettuce
3435
> workon lettuce
3536
> pip install -r requirements.txt
36-
37+
note this uses [virtualenvwrapper](http://virtualenvwrapper.readthedocs.org/en/latest/) to save some virtualenv handling hassle. you can also use virtualenv the regular way.
3738
## or just install manually:
3839

3940
> sudo pip install -r requirements.txt

_public/reference/cli.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ <h3 id="verbosity-levels" name="verbosity-levels"><a href="#verbosity-levels">ve
207207
<span class="n">Then</span> <span class="n">I</span> <span class="n">see</span> <span class="n">the</span> <span class="n">string</span> <span class="k">is</span> <span class="s2">"LETTUCE LEAVES"</span>
208208
</pre></div>
209209
<p>Your output will look like:</p>
210-
<div class="highlight"><pre name="the-command-line-example-12"><span class="n">user</span><span class="p">@</span><span class="n">machine</span><span class="p">:</span><span class="o">~/</span><span class="n">projects</span><span class="o">/</span><span class="n">myproj</span>$ <span class="n">lettuce</span> <span class="o">-</span><span class="n">v</span> 2
210+
<div class="highlight"><pre name="the-command-line-example-12"><span class="n">user</span><span class="p">@</span><span class="n">machine</span><span class="p">:</span><span class="o">~/</span><span class="n">projects</span><span class="o">/</span><span class="n">myproj</span>$ <span class="n">lettuce</span> <span class="o">-</span><span class="n">v</span> 3
211211

212212
<span class="n">Feature</span><span class="p">:</span> <span class="n">Manipulate</span> <span class="n">strings</span> # <span class="n">features</span><span class="o">/</span><span class="n">strings</span><span class="p">.</span><span class="n">feature</span><span class="p">:</span>1
213213

@@ -404,4 +404,4 @@ <h3 class="footer-title">Table of contents</h3>
404404
</div>
405405
</footer>
406406
</body>
407-
</html>
407+
</html>

docs/Makefile

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line.
5+
SPHINXOPTS =
6+
SPHINXBUILD = sphinx-build
7+
PAPER =
8+
BUILDDIR = _build
9+
10+
# Internal variables.
11+
PAPEROPT_a4 = -D latex_paper_size=a4
12+
PAPEROPT_letter = -D latex_paper_size=letter
13+
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
14+
15+
export PYTHONPATH:= ${PYTHONPATH}:${PWD}/../:${PWD}/_ext
16+
17+
.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
18+
19+
help:
20+
@echo "Please use \`make <target>' where <target> is one of"
21+
@echo " html to make standalone HTML files"
22+
@echo " dirhtml to make HTML files named index.html in directories"
23+
@echo " pickle to make pickle files"
24+
@echo " json to make JSON files"
25+
@echo " htmlhelp to make HTML files and a HTML help project"
26+
@echo " qthelp to make HTML files and a qthelp project"
27+
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
28+
@echo " changes to make an overview of all changed/added/deprecated items"
29+
@echo " linkcheck to check all external links for integrity"
30+
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
31+
32+
clean:
33+
-rm -rf $(BUILDDIR)/*
34+
35+
html: clean
36+
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
37+
@echo
38+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
39+
40+
dirhtml:
41+
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
42+
@echo
43+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
44+
45+
pickle:
46+
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
47+
@echo
48+
@echo "Build finished; now you can process the pickle files."
49+
50+
json:
51+
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
52+
@echo
53+
@echo "Build finished; now you can process the JSON files."
54+
55+
htmlhelp:
56+
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
57+
@echo
58+
@echo "Build finished; now you can run HTML Help Workshop with the" \
59+
".hhp project file in $(BUILDDIR)/htmlhelp."
60+
61+
qthelp:
62+
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
63+
@echo
64+
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
65+
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
66+
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/as.qhcp"
67+
@echo "To view the help file:"
68+
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/as.qhc"
69+
70+
latex:
71+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
72+
@echo
73+
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
74+
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
75+
"run these through (pdf)latex."
76+
77+
changes:
78+
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
79+
@echo
80+
@echo "The overview file is in $(BUILDDIR)/changes."
81+
82+
linkcheck:
83+
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
84+
@echo
85+
@echo "Link check complete; look for any errors in the above output " \
86+
"or in $(BUILDDIR)/linkcheck/output.txt."
87+
88+
doctest:
89+
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
90+
@echo "Testing of doctests in the sources finished, look at the " \
91+
"results in $(BUILDDIR)/doctest/output.txt."

docs/_ext/adjusts.py

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
from sphinx.writers import html as sphinx_htmlwriter
2+
3+
class LettuceHTMLTranslator(sphinx_htmlwriter.SmartyPantsHTMLTranslator):
4+
"""
5+
Lettuce-customized HTML transformations of documentation. Based on
6+
djangodocs.DjangoHTMLTranslator
7+
"""
8+
9+
def visit_section(self, node):
10+
node['ids'] = map(lambda x: "lettuce-%s" % x, node['ids'])
11+
sphinx_htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node)

docs/_static/background.jpg

238 KB
Loading

0 commit comments

Comments
 (0)