IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add some changes not picked up in the transplantation process.

Browse Source
This commit is contained in:
Georg Brandl 2010-07-28 19:49:06 +02:00
parent 2d0c9a0e71
commit c683c6ed83
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
PYTHON ?= python3 PYTHON ?= python
.PHONY: all check clean clean-pyc clean-patchfiles clean-generated pylint \ .PHONY: all check clean clean-pyc clean-patchfiles clean-generated pylint \
reindent test reindent test

12
README
View File

@ -26,6 +26,18 @@ Then, direct your browser to ``_build/html/index.html``.
Or read them online at <http://sphinx.pocoo.org/>. Or read them online at <http://sphinx.pocoo.org/>.
Testing
=======
To run the tests with the interpreter available as ``python``, use::
make test
If you want to use a different interpreter, e.g. ``python3``, use::
PYTHON=python3 make test
Contributing Contributing
============ ============

8
doc/intro.rst
View File

@ -45,10 +45,10 @@ See the :ref:`pertinent section in the FAQ list <usingwith>`.
Prerequisites Prerequisites
------------- -------------
Sphinx needs at least **Python 2.4** to run, as well as the docutils_ and Sphinx needs at least **Python 2.4** or **Python 3.1** to run, as well as the
Jinja2_ libraries. Sphinx should work with docutils version 0.5 or some docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.5
(not broken) SVN trunk snapshot. If you like to have source code highlighting or some (not broken) SVN trunk snapshot. If you like to have source code
support, you must also install the Pygments_ library. highlighting support, you must also install the Pygments_ library.
.. _reStructuredText: http://docutils.sf.net/rst.html .. _reStructuredText: http://docutils.sf.net/rst.html
.. _docutils: http://docutils.sf.net/ .. _docutils: http://docutils.sf.net/

9
tests/test_build_html.py
View File

@ -51,6 +51,11 @@ HTML_WARNINGS = ENV_WARNINGS + """\
%(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; ' %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; '
""" """
if sys.version_info >= (3, 0):
ENV_WARNINGS = remove_unicode_literals(ENV_WARNINGS)
HTML_WARNINGS = remove_unicode_literals(HTML_WARNINGS)
def tail_check(check): def tail_check(check):
rex = re.compile(check) rex = re.compile(check)
def checker(nodes): def checker(nodes):
@ -61,10 +66,6 @@ def tail_check(check):
return checker return checker
if sys.version_info >= (3, 0):
ENV_WARNINGS = remove_unicode_literals(ENV_WARNINGS)
HTML_WARNINGS = remove_unicode_literals(HTML_WARNINGS)
HTML_XPATH = { HTML_XPATH = {
'images.html': [ 'images.html': [
(".//img[@src='_images/img.png']", ''), (".//img[@src='_images/img.png']", ''),