Merge pull request #101 from mcmtroffaes/release/0.3.4

Prepare release.

CHANGELOG.rst

@@ -7,6 +7,8 @@
 * Add ``bibtex_default_style`` config value to override the default
   bibliography style (see issue #91 and pull request #97).
 
+* Support Python 3.5 (see issue #100).
+
 0.3.3 (23 October 2015)
 -----------------------
 

VERSION

@@ -1 +1 @@
-0.3.4a1
+0.3.4

setup.py

@@ -40,6 +40,7 @@ def readfile(filename):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Documentation',

shell.nix

@@ -12,12 +12,14 @@ with import <nixpkgs> {}; {
       python27
       python33
       python34
+      python35
       # development tools and libraries
       stdenv
       libxml2
       libxslt
-      python27Packages.tox
-      python27Packages.cython
+      python35Packages.tox
+      python35Packages.cython
+      python35Packages.sphinx
     ];
   };
 }

sphinxcontrib/bibtex/__init__.py

@@ -12,6 +12,7 @@
 """
 
 import docutils.nodes
+import docutils.parsers.rst
 from sphinxcontrib.bibtex.cache import Cache
 from sphinxcontrib.bibtex.nodes import bibliography
 from sphinxcontrib.bibtex.roles import CiteRole
@@ -123,15 +124,24 @@ def setup(app):
     """
 
     app.add_config_value("bibtex_default_style", "alpha", "html")
-    app.add_directive("bibliography", BibliographyDirective)
-    app.add_role("cite", CiteRole())
-    app.add_node(bibliography)
-    app.add_transform(BibliographyTransform)
     app.connect("builder-inited", init_bibtex_cache)
     app.connect("doctree-resolved", process_citations)
     app.connect("doctree-resolved", process_citation_references)
     app.connect("env-purge-doc", purge_bibtex_cache)
     app.connect("env-updated", check_duplicate_labels)
+
+    # docutils keeps state around during testing, so to avoid spurious
+    # warnings, we detect here whether the directives have already been
+    # registered... very ugly hack but no better solution so far
+    _directives = docutils.parsers.rst.directives._directives
+    if "bibliography" not in _directives:
+        app.add_directive("bibliography", BibliographyDirective)
+        app.add_role("cite", CiteRole())
+        app.add_node(bibliography)
+        app.add_transform(BibliographyTransform)
+    else:
+        assert _directives["bibliography"] is BibliographyDirective
+
     # Parallel read is not safe at the moment: in the current design,
     # the document that contains references must be read last for all
     # references to be resolved.

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py27,py33,py34,doc
+envlist=py27,py33,py34,py35,doc
 
 [testenv]
 deps=