Skip to content

Commit

Permalink
Fix generating documentation. (#24)
Browse files Browse the repository at this point in the history
Use `Sphinx < 4` to prevent problems with `repoze.sphinx.autointerface`.
  • Loading branch information
Michael Howitz committed May 11, 2021
1 parent 6e5462f commit d56c36d
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 11 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ name: tests

on:
push:
branches: [ master ]
pull_request:
schedule:
- cron: '0 12 * * 0' # run once a week on Sunday
# Allow to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
strategy:
# We want do see all failures:
fail-fast: false
matrix:
config:
# [Python version, tox env]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
.installed.cfg
.mr.developer.cfg
.tox/
.vscode/
__pycache__/
bin/
build/
Expand Down
7 changes: 6 additions & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
[meta]
template = "zope-product"
commit-id = "4415752fead07401ce0e45c7d27ed81f6eeddf4f"
commit-id = "f8468b0bc5c92479b3043372d89cf5852176015d"

[python]
with-appveyor = false
Expand All @@ -29,11 +29,16 @@ additional-rules = [
"include buildout4.cfg",
"recursive-include src *.dtml",
"recursive-include src *.gif",
"recursive-include src *.pt",
"recursive-include src *.xml",
"recursive-include src *.zcml",
]

[check-manifest]
additional-ignores = [
"docs/_build/html/_sources/narrative/*",
"docs/_build/html/_sources/api/*",
]

[tox]
use-flake8 = true
7 changes: 2 additions & 5 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@ include *.txt
include buildout.cfg
include tox.ini

recursive-include docs *.bat
recursive-include docs *.py
recursive-include docs *.rst
recursive-include docs *.txt
recursive-include docs Makefile

recursive-include src *.pt
recursive-include src *.py
recursive-include src *.rst
recursive-include src *.txt
recursive-include src *.zcml
include buildout4.cfg
recursive-include src *.dtml
recursive-include src *.gif
recursive-include src *.pt
recursive-include src *.xml
recursive-include src *.zcml
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ force_single_line = True
combine_as_imports = True
sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
known_third_party = six, docutils, pkg_resources
known_zope =
known_zope =
known_first_party = Products.CMFCore
default_section = ZOPE
line_length = 79
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ skip_install = true
deps =
setuptools < 52
zc.buildout
zope.testrunner
commands_pre =
py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
!py27-!py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
Expand All @@ -27,10 +28,10 @@ commands =

[testenv:lint]
basepython = python3
allowlist_externals =
mkdir
commands_pre =
mkdir -p {toxinidir}/parts/flake8
allowlist_externals =
mkdir
commands =
isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py
- flake8 --format=html {toxinidir}/src {toxinidir}/setup.py
Expand Down Expand Up @@ -60,7 +61,8 @@ commands =
[testenv:docs]
basepython = python3
skip_install = false
deps =
# Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
deps = Sphinx < 4
extras =
docs
commands_pre =
Expand Down

0 comments on commit d56c36d

Please sign in to comment.