Skip to content

Commit

Permalink
Try to fix the tests
Browse files Browse the repository at this point in the history 
Whoops: zope.interface and other modules no longer install their
documentation into the Python package directory -- they moved to
Sphinx-based docs that are present in the sdist but not included in
binary distributions.

zope.app.apidoc needs to be redesigned (to fetch the source packages
perhaps?  using mr.developer or something) or it needs to pin
zope.interface etc. to older versions (but then what use is it?).
  • Loading branch information
@mgedmin
mgedmin committed Dec 23, 2014
1 parent 59b393b commit 539d418
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 77 deletions.
11 changes: 11 additions & 0 deletions .gitignore
View file
@@ -0,0 +1,11 @@
bin/
eggs/
develop-eggs/
parts/
.installed.cfg
*.py[co]
__pycache__/
build/
dist/
*.egg-info/
.tox/
2 changes: 1 addition & 1 deletion .travis.yml
View file
Expand Up @@ -5,6 +5,6 @@ install:
- python bootstrap.py
- bin/buildout
script:
- bin/test -v1
- bin/test -v1 --ndiff
notifications:
email: false
74 changes: 37 additions & 37 deletions src/zope/app/apidoc/bookmodule/book.zcml
View file
Expand Up @@ -11,39 +11,39 @@
<bookchapter
id="interface"
title="Interfaces"
doc_path="README.txt"
doc_path="README.rst"
parent="ifaceschema"
/>
<bookchapter
id="adapter"
title="Adapter Registry"
doc_path="adapter.txt"
doc_path="adapter.rst"
parent="ifaceschema"
/>
<bookchapter
id="human"
title="Adapters (light version)"
doc_path="human.txt"
doc_path="human.rst"
parent="ifaceschema"
/>
<bookchapter
id="foodforthought"
title="Food For Thought"
doc_path="tests/foodforthought.txt"
doc_path="tests/foodforthought.rst"
parent="ifaceschema"
/>
</configure>
<configure package="zope.schema">
<bookchapter
id="schemas"
title="Schemas"
doc_path="README.txt"
doc_path="README.rst"
parent="ifaceschema"
/>
<bookchapter
id="fields"
title="Schema Fields"
doc_path="fields.txt"
doc_path="fields.rst"
parent="ifaceschema"
/>
</configure>
Expand All @@ -59,19 +59,19 @@
id="global"
title="Global Component Architecture"
parent="ca"
doc_path="README.txt"
doc_path="README.rst"
/>
<bookchapter
id="socket"
title="Global CA (Socket Example)"
parent="ca"
doc_path="socketexample.txt"
doc_path="socketexample.rst"
/>
<bookchapter
id="factory"
title="Factories"
parent="ca"
doc_path="factory.txt"
doc_path="factory.rst"
/>
</configure>

Expand All @@ -80,13 +80,13 @@
id="local"
title="Local Component Architecture"
parent="ca"
doc_path="site.txt"
doc_path="site.rst"
/>
<bookchapter
id="site"
title="Local Sites &amp; Site Managers"
parent="ca/local"
doc_path="site.txt"
doc_path="site.rst"
/>
</configure>

Expand All @@ -95,38 +95,38 @@
<bookchapter
id="security"
title="Security"
doc_path="README.txt"
doc_path="README.rst"
/>
<bookchapter
id="untrusted"
title="Untrusted Interpreters"
doc_path="untrustedinterpreter.txt"
doc_path="untrustedinterpreter.rst"
parent="security"
/>
<bookchapter
id="interpreter"
title="Untrusted Python Interpreter"
doc_path="untrustedpython/interpreter.txt"
doc_path="untrustedpython/interpreter.rst"
parent="security/untrusted"
/>
<bookchapter
id="rcompile"
title="Restricted Python Code"
doc_path="untrustedpython/rcompile.txt"
doc_path="untrustedpython/rcompile.rst"
parent="security/untrusted"
/>
<bookchapter
id="builtins"
title="Safe Builtins"
doc_path="untrustedpython/builtins.txt"
doc_path="untrustedpython/builtins.rst"
parent="security/untrusted"
/>
</configure>
<configure package="zope.principalregistry">
<bookchapter
id="globalprincipals"
title="Global Principals"
doc_path="README.txt"
doc_path="README.rst"
parent="security"
/>
</configure>
Expand All @@ -140,35 +140,35 @@
<bookchapter
id="testbrowser"
title="The Test Browser"
doc_path="README.txt"
doc_path="README.rst"
parent="test"
/>
<bookchapter
id="overthewire"
title="Using testbrowser On the Internet"
doc_path="over_the_wire.txt"
doc_path="over_the_wire.rst"
parent="test"
/>
</configure>
<configure package="zope.app.testing">
<bookchapter
id="fdoctest"
title="Functional DocTest"
doc_path="doctest.txt"
doc_path="doctest.rst"
parent="test"
/>
<bookchapter
id="fdoctest-howto"
title="FDocTest (How to)"
doc_path="dochttp.txt"
doc_path="dochttp.rst"
parent="test"
/>
</configure>
<configure package="zope.testing">
<bookchapter
id="formparser"
title="Form Parser"
doc_path="formparser.txt"
doc_path="formparser.rst"
parent="test"
/>
</configure>
Expand All @@ -182,7 +182,7 @@
<bookchapter
id="messageid"
title="Messages"
doc_path="messages.txt"
doc_path="messages.rst"
parent="i18nl10n"
/>
</configure>
Expand All @@ -192,7 +192,7 @@
<bookchapter
id="cachedprops"
title="Cached Properties"
doc_path="property.txt"
doc_path="property.rst"
/>
</configure>

Expand All @@ -201,7 +201,7 @@
<bookchapter
id="deprecation"
title="Deprecation API"
doc_path="README.txt"
doc_path="README.rst"
/>
</configure>

Expand All @@ -210,7 +210,7 @@
<bookchapter
id="persistent"
title="Persistent Framework"
doc_path="persistent.txt"
doc_path="persistent.rst"
/>
</configure>

Expand All @@ -224,13 +224,13 @@
id="savepoints"
title="Savepoints"
parent="transaction"
doc_path="tests/savepoint.txt"
doc_path="tests/savepoint.rst"
/>
<bookchapter
id="doom"
title="Dooming transactions"
parent="transaction"
doc_path="tests/doom.txt"
doc_path="tests/doom.rst"
/>
</configure>

Expand All @@ -244,49 +244,49 @@
id="multidb"
title="Multiple Databases"
parent="zodb"
doc_path="tests/multidb.txt"
doc_path="tests/multidb.rst"
/>
<bookchapter
id="crossref"
title="Cross-Database References"
parent="zodb"
doc_path="cross-database-references.txt"
doc_path="cross-database-references.rst"
/>
<bookchapter
id="collaboration"
title="Collaboration Diagrams"
parent="zodb"
doc_path="collaborations.txt"
doc_path="collaborations.rst"
/>
<bookchapter
id="dbopen"
title="Connection Management"
parent="zodb"
doc_path="tests/dbopen.txt"
doc_path="tests/dbopen.rst"
/>
<bookchapter
id="persistentclass"
title="Persistent Classes"
parent="zodb"
doc_path="persistentclass.txt"
doc_path="persistentclass.rst"
/>
<bookchapter
id="savepoints"
title="Savepoints"
parent="zodb"
doc_path="tests/testConnectionSavepoint.txt"
doc_path="tests/testConnectionSavepoint.rst"
/>
<bookchapter
id="subtransactions"
title="Sub-Transactions"
parent="zodb"
doc_path="subtransactions.txt"
doc_path="subtransactions.rst"
/>
<bookchapter
id="synchronizers"
title="Synchronizers"
parent="zodb"
doc_path="tests/synchronizers.txt"
doc_path="tests/synchronizers.rst"
/>
</configure>

Expand All @@ -295,7 +295,7 @@
<bookchapter
id="btrees"
title="BTree Developer Information"
doc_path="Development.txt"
doc_path="Development.rst"
/>
</configure>

Expand Down
42 changes: 21 additions & 21 deletions src/zope/app/apidoc/codemodule/browser/README.txt
View file
Expand Up @@ -534,27 +534,27 @@ object's attributes:
Of course, the methods are listed as well:

>>> pprint(list(inspect.getMethods()))
[...
{'doc': u'',
'interface': 'zope.component.interfaces.IPossibleSite',
'name': 'getSiteManager',
'read_perm': None,
'signature': '()',
'write_perm': None},
...
{'doc': u'<p>Return a sequence-like...',
'interface': 'zope.interface.common.mapping.IEnumerableMapping',
'name': 'keys',
'read_perm': None,
'signature': '()',
'write_perm': None},
{'doc': u'',
'interface': 'zope.component.interfaces.IPossibleSite',
'name': 'setSiteManager',
'read_perm': None,
'signature': '(sm)',
'write_perm': None},
...]
[...
{'doc': u'',
'interface': 'zope.component.interfaces.IPossibleSite',
'name': 'getSiteManager',
'read_perm': None,
'signature': '()',
'write_perm': None},
...
{'doc': u'',
'interface': 'zope.container.interfaces.IBTreeContainer',
'name': 'keys',
'read_perm': None,
'signature': '(key=None)',
'write_perm': None},
{'doc': u'',
'interface': 'zope.component.interfaces.IPossibleSite',
'name': 'setSiteManager',
'read_perm': None,
'signature': '(sm)',
'write_perm': None},
...]

The final methods deal with inspecting the objects data further. For exmaple,
if we inspect a sequence,
Expand Down

0 comments on commit 539d418

Please sign in to comment.