Skip to content
This repository has been archived by the owner on Mar 26, 2024. It is now read-only.

REF: py38, sphinx>=1.7.0, try/except add_config_value("author") #118

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -21,7 +21,7 @@
Tinkerer is also highly customizable through Sphinx extensions.
'''

requires = ["Jinja2>=2.3", "Sphinx==1.7.1", "Babel>=1.3", "pyquery>=1.2.8"]
requires = ["Jinja2>=2.3", "Sphinx>=1.7.0", "Babel>=1.3", "pyquery>=1.2.8"]

test_requires = ['nose', 'tox']

Expand Down
6 changes: 5 additions & 1 deletion tinkerer/ext/blog.py
Expand Up @@ -8,6 +8,7 @@
CONTRIBUTORS file)
:license: FreeBSD, see LICENSE file
'''
from sphinx.errors import ExtensionError
from tinkerer.ext import (aggregator, author, filing, html5, metadata, patch,
readmore, rss, uistr)
import gettext
Expand Down Expand Up @@ -123,7 +124,10 @@ def setup(app):
# new config values
app.add_config_value("tagline", "My blog", True)
app.add_config_value("description", "My blog", True)
app.add_config_value("author", "Winston Smith", True)
try:
app.add_config_value("author", "Winston Smith", True) # Sphinx 1.7.1
except ExtensionError as e:
pass
app.add_config_value("rss_service", None, True)
app.add_config_value("rss_generate_full_posts", False, True)
app.add_config_value("website", "http://127.0.0.1/blog/html/", True)
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py36
envlist = py38

[testenv]
deps =
Expand All @@ -17,5 +17,5 @@ commands = flake8 tinkerer tinkertest
deps =
nose
coverage
basepython=python3.6
basepython=python3.8
commands = nosetests --with-cover --cover-package=tinkerer --cover-inclusive {posargs}