Skip to content

Commit

Permalink
update docs/conf to match version
Browse files Browse the repository at this point in the history
  • Loading branch information
loechel committed Oct 7, 2023
1 parent 1d6fcab commit 8e77e70
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ testenv-additional = [
" coverage combine",
" coverage html",
" coverage report -m --fail-under=100",
"depends = py37,py38,py39,py39-datetime,py310,py311,py312coverage",
"depends = py37,py38,py39,py39-datetime,py310,py311,py312,coverage",
]
coverage-basepython = "python3.8"
coverage-command = "pytest --cov=src --cov=tests --cov-report= {posargs}"
Expand Down
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@

# General information about the project.
project = 'RestrictedPython'
copyright = '2017-2022, Zope Foundation and Contributors'
copyright = '2017-2023, Zope Foundation and Contributors'
author = 'The Zope & Plone developer community'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '5.0'
version = '7.0'
# The full version, including alpha/beta/rc tags.
release = '5.0'
release = '7.0a1.dev2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -217,7 +217,7 @@
# html_search_scorer = 'scorer.js'

# Output file base name for HTML help builder.
htmlhelp_basename = 'RestrictedPythondoc'
htmlhelp_basename = 'RestrictedPython_doc'

# -- Options for LaTeX output ---------------------------------------------

Expand Down
18 changes: 11 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
minversion = 3.18
envlist =
lint
docs
py39-datetime
py37
py38
py39
py310
py311
py312
docs
coverage
py39-datetime
# coverage
combined-coverage

[testenv]
Expand Down Expand Up @@ -52,19 +52,22 @@ commands =
coverage combine
coverage html
coverage report -m --fail-under=100
depends = py37,py38,py39,py39-datetime,py310,py311,py312coverage
depends = py37,py38,py39,py39-datetime,py310,py311,py312,coverage

[testenv:lint]
basepython = python3
skip_install = true
commands =
black --check --diff -v {toxinidir}/src {toxinidir}/tests
isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py {toxinidir}/tests
flake8 src setup.py tests
check-manifest
check-python-versions
black --check --diff -v {toxinidir}/src {toxinidir}/tests
deps =
check-manifest
check-python-versions >= 0.19.1
check-python-versions >= 0.20.0
black
wheel
flake8
isort
Expand All @@ -85,6 +88,7 @@ commands_pre =
commands =
sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
coverage run -a -m sphinx -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest

[testenv:coverage]
basepython = python3.8
Expand All @@ -102,8 +106,8 @@ commands =
mkdir -p {toxinidir}/parts/htmlcov
pytest --cov=src --cov=tests --cov-report= {posargs}
coverage run -a -m sphinx -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
coverage html --ignore-errors
coverage report --ignore-errors --show-missing --fail-under=98.4
#coverage html --ignore-errors
#coverage report --ignore-errors --show-missing --fail-under=98.4

[coverage:run]
branch = True
Expand Down

0 comments on commit 8e77e70

Please sign in to comment.