Skip to content

Commit

Permalink
Poetry: bump Sphinx to 7.3.7
Browse files Browse the repository at this point in the history
Handle new dependency issues.
  • Loading branch information
brechtm committed Jul 12, 2024
1 parent 330a88f commit 6f5039e
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 114 deletions.
19 changes: 11 additions & 8 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,22 @@ def _install(session, docutils=None, sphinx=None, dist='wheel',
if docutils:
session.run("pip", "install", f"docutils=={docutils}")
if sphinx:
session.run("pip", "install", f"sphinx=={sphinx}")
deps = [f"sphinx=={sphinx}"]
major, _ = sphinx.split('.', maxsplit=1)
if int(major) < 4:
# https://github.com/sphinx-doc/sphinx/issues/10291
session.run("pip", "install", "jinja2<3.1")
deps.append("jinja2<3.1")
elif int(major) < 6:
deps.append("myst-parser==0.18.1")
if int(major) < 5:
# https://github.com/sphinx-doc/sphinx/issues/11890
session.run("pip", "install", "alabaster==0.7.13")
session.run("pip", "install", "sphinxcontrib-applehelp==1.0.4")
session.run("pip", "install", "sphinxcontrib-devhelp==1.0.2")
session.run("pip", "install", "sphinxcontrib-htmlhelp==2.0.1")
session.run("pip", "install", "sphinxcontrib-serializinghtml==1.1.5")
session.run("pip", "install", "sphinxcontrib-qthelp==1.0.3")
deps.append("alabaster==0.7.13")
deps.append("sphinxcontrib-applehelp==1.0.4")
deps.append("sphinxcontrib-devhelp==1.0.2")
deps.append("sphinxcontrib-htmlhelp==2.0.1")
deps.append("sphinxcontrib-serializinghtml==1.1.5")
deps.append("sphinxcontrib-qthelp==1.0.3")
session.run("pip", "install", *deps)


def _unit(session, docutils=None, sphinx=None, dist='wheel',
Expand Down
2 changes: 1 addition & 1 deletion noxutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_versions(
package = Factory().create_poetry(Path(__file__).parent).package
requirements = [
requirement
for requirement in package.requires
for requirement in package.all_requires
if requirement.name == dependency
]
if not requirements:
Expand Down
181 changes: 82 additions & 99 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,12 @@ rinoh = "rinoh.frontend.sphinx"
python = "^3.8.0"
appdirs = "^1.4.3"
docutils = ">=0.15"
myst-parser = "^0.18.1"
myst-parser = ">=0.18.1"
packaging = ">=14.0"
rinoh-typeface-dejavuserif = "^0.1.3"
rinoh-typeface-texgyrecursor = "^0.1.1"
rinoh-typeface-texgyreheros = "^0.1.1"
rinoh-typeface-texgyrepagella = "^0.1.1"
Sphinx = [
{version = ">=2.2.1", python = "<3.10", optional = true},
{version = ">=2.2.1,!=3.5.*,!=4.0.*,!=4.1.*", python = ">=3.10", optional = true}
]

[tool.poetry.group.dev.dependencies]
doc8 = "^1.0.0"
Expand All @@ -109,7 +105,12 @@ pytest-console-scripts = "^1.3"
pytest-cov = "^5.0.0"
pytest-xdist = "^3.0.2"
restview = "^3.0.0"
Sphinx = "^5.2.1"
Sphinx = [
{version = ">=2.2.1,<7.2.0", python = "<3.9"},
{version = ">=2.2.1", python = "3.9"},
{version = ">=2.2.1,!=3.5.*,!=4.0.*,!=4.1.*", python = ">=3.10"}
]
defusedxml = ">=0.7.1" # for Sphinx>=7.3
sphinx-immaterial = ">=0.10"
sphinxcontrib-autoprogram = "^0.1.7"
pytest-github-actions-annotate-failures = { version = "^0.2.0", optional = true }
Expand Down

0 comments on commit 6f5039e

Please sign in to comment.