Skip to content

Commit 6f5039e

Browse files
committed
Poetry: bump Sphinx to 7.3.7
Handle new dependency issues.
1 parent 330a88f commit 6f5039e

File tree

4 files changed

+101
-114
lines changed

4 files changed

+101
-114
lines changed

noxfile.py

+11-8
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,22 @@ def _install(session, docutils=None, sphinx=None, dist='wheel',
120120
if docutils:
121121
session.run("pip", "install", f"docutils=={docutils}")
122122
if sphinx:
123-
session.run("pip", "install", f"sphinx=={sphinx}")
123+
deps = [f"sphinx=={sphinx}"]
124124
major, _ = sphinx.split('.', maxsplit=1)
125125
if int(major) < 4:
126126
# https://github.com/sphinx-doc/sphinx/issues/10291
127-
session.run("pip", "install", "jinja2<3.1")
127+
deps.append("jinja2<3.1")
128+
elif int(major) < 6:
129+
deps.append("myst-parser==0.18.1")
128130
if int(major) < 5:
129131
# https://github.com/sphinx-doc/sphinx/issues/11890
130-
session.run("pip", "install", "alabaster==0.7.13")
131-
session.run("pip", "install", "sphinxcontrib-applehelp==1.0.4")
132-
session.run("pip", "install", "sphinxcontrib-devhelp==1.0.2")
133-
session.run("pip", "install", "sphinxcontrib-htmlhelp==2.0.1")
134-
session.run("pip", "install", "sphinxcontrib-serializinghtml==1.1.5")
135-
session.run("pip", "install", "sphinxcontrib-qthelp==1.0.3")
132+
deps.append("alabaster==0.7.13")
133+
deps.append("sphinxcontrib-applehelp==1.0.4")
134+
deps.append("sphinxcontrib-devhelp==1.0.2")
135+
deps.append("sphinxcontrib-htmlhelp==2.0.1")
136+
deps.append("sphinxcontrib-serializinghtml==1.1.5")
137+
deps.append("sphinxcontrib-qthelp==1.0.3")
138+
session.run("pip", "install", *deps)
136139

137140

138141
def _unit(session, docutils=None, sphinx=None, dist='wheel',

noxutil.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def get_versions(
3939
package = Factory().create_poetry(Path(__file__).parent).package
4040
requirements = [
4141
requirement
42-
for requirement in package.requires
42+
for requirement in package.all_requires
4343
if requirement.name == dependency
4444
]
4545
if not requirements:

poetry.lock

+82-99
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+7-6
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,12 @@ rinoh = "rinoh.frontend.sphinx"
8787
python = "^3.8.0"
8888
appdirs = "^1.4.3"
8989
docutils = ">=0.15"
90-
myst-parser = "^0.18.1"
90+
myst-parser = ">=0.18.1"
9191
packaging = ">=14.0"
9292
rinoh-typeface-dejavuserif = "^0.1.3"
9393
rinoh-typeface-texgyrecursor = "^0.1.1"
9494
rinoh-typeface-texgyreheros = "^0.1.1"
9595
rinoh-typeface-texgyrepagella = "^0.1.1"
96-
Sphinx = [
97-
{version = ">=2.2.1", python = "<3.10", optional = true},
98-
{version = ">=2.2.1,!=3.5.*,!=4.0.*,!=4.1.*", python = ">=3.10", optional = true}
99-
]
10096

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

0 commit comments

Comments
 (0)