Skip to content

Commit

Permalink
Fix generating documentation. (#970)
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 authored May 11, 2021
1 parent 0ecd1ce commit 1746d5a
Show file tree
Hide file tree
Showing 5 changed files with 22 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
8 changes: 7 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 = "211d612c86d6754ebe13fad9b7081533bb603ed9"
commit-id = "f8468b0bc5c92479b3043372d89cf5852176015d"

[python]
with-appveyor = true
Expand Down Expand Up @@ -58,6 +58,7 @@ testenv-additional = [
" autopep8 --verbose --in-place --recursive --aggressive --aggressive {toxinidir}/src setup.py",
" docformatter --in-place --recursive {toxinidir}/src setup.py",
]
use-flake8 = true

[manifest]
additional-rules = [
Expand All @@ -67,6 +68,7 @@ additional-rules = [
"include versions-prod.cfg",
"include versions.cfg",
"include zope-ecosystem.cfg",
"recursive-include docs *.bat",
"recursive-include docs *.css",
"recursive-include docs *.jpg",
"recursive-include docs *.png",
Expand All @@ -86,12 +88,16 @@ additional-rules = [
"recursive-include src *.png",
"recursive-include src *.po",
"recursive-include src *.pot",
"recursive-include src *.pt",
"recursive-include src *.rst",
"recursive-include src *.svg",
"recursive-include src *.ttf",
"recursive-include src *.txt",
"recursive-include src *.webmanifest",
"recursive-include src *.woff",
"recursive-include src *.woff2",
"recursive-include src *.xml",
"recursive-include src *.zcml",
"recursive-include src *.zpt",
]

Expand Down
10 changes: 5 additions & 5 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,19 @@ include buildout.cfg
include tox.ini
include appveyor.yml

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 *.py
include *.yaml
include sources.cfg
include versions-prod.cfg
include versions.cfg
include zope-ecosystem.cfg
recursive-include docs *.bat
recursive-include docs *.css
recursive-include docs *.jpg
recursive-include docs *.png
Expand All @@ -42,10 +38,14 @@ recursive-include src *.pdf
recursive-include src *.png
recursive-include src *.po
recursive-include src *.pot
recursive-include src *.pt
recursive-include src *.rst
recursive-include src *.svg
recursive-include src *.ttf
recursive-include src *.txt
recursive-include src *.webmanifest
recursive-include src *.woff
recursive-include src *.woff2
recursive-include src *.xml
recursive-include src *.zcml
recursive-include src *.zpt
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ combine_as_imports = True
sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
known_third_party = ipaddress, PasteDeploy, waitress, chameleon, paste, pkg_resources
known_zope = AccessControl, Acquisition, App, DateTime, DocumentTemplate, ExtensionClass, MultiMapping, OFS, Persistence, persistent, Products, RestrictedPython, Shared, Testing, transaction, webdav, ZConfig, zExceptions, zmi, ZODB, zope, Zope2, ZPublisher, ZTUtils
known_first_party =
known_first_party =
default_section = ZOPE
line_length = 79
lines_after_imports = 2
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ skip_install = true
deps =
setuptools < 52
zc.buildout
zope.testrunner
commands_pre =
{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install alltests
commands =
Expand Down Expand Up @@ -46,10 +47,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 @@ -79,7 +80,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 1746d5a

Please sign in to comment.