Commit 49497c7a authored by Jim Fulton's avatar Jim Fulton

Reorganization (flatification)

- can ``make html`` from doc directory and get html.

- documentation tests run as part of normal tests.

README.rst needs some love.

Then on to making this work with RTD.
parent f192110f
......@@ -3,6 +3,7 @@ develop = .
parts =
test
scripts
sphinx
[versions]
# Avoid breakage in 4.4.5:
......@@ -40,3 +41,15 @@ arguments = ('${buildout:directory}/coverage',
recipe = zc.recipe.egg
eggs = ${test:eggs}
interpreter = py
[sphinx]
recipe = zc.recipe.egg
eggs =
Sphinx
docutils
ZODB
j1m.sphinxautointerface
j1m.sphinxautozconfig
scripts =
sphinx-build
interpreter = stxpy
......@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = bin/sphinx-build
SPHINXBUILD = ../bin/sphinx-build
PAPER =
# Internal variables.
......
......@@ -14,7 +14,7 @@ Because ZODB is an object database:
- almost no seam between code and database.
Check out the :doc:`documentation/tutorial`!
Check out the :doc:`tutorial`!
Transactions
============
......@@ -196,10 +196,10 @@ Learning more
.. toctree::
:maxdepth: 1
documentation/tutorial
documentation/guide/index
documentation/reference/index
documentation/articles/index
tutorial
guide/index
reference/index
articles/index
* `The ZODB Book (in progress) <http://zodb.readthedocs.org/en/latest/>`_
......
......@@ -11,6 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
from os.path import join
import os
import doctest
import unittest
......@@ -19,10 +20,9 @@ import manuel.doctest
import manuel.testing
import zope.testing.module
from os.path import join
import ZODB
def setUp(test):
import ZODB
test.globs.update(
ZODB=ZODB,
)
......@@ -32,9 +32,11 @@ def tearDown(test):
zope.testing.module.tearDown(test)
def test_suite():
here = os.path.dirname(__file__)
guide = join(here, '..', 'documentation', 'guide')
reference = join(here, '..', 'documentation', 'reference')
base, src = os.path.split(os.path.dirname(os.path.dirname(ZODB.__file__)))
assert src == 'src'
base = join(base, 'doc')
guide = join(base, 'guide')
reference = join(base, 'reference')
return unittest.TestSuite((
manuel.testing.TestSuite(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment