Skip to content

Commit 7771d05

Browse files
authored
Remove Jinja2 dependency (#1360)
* Remove Jinja2 dependency, inherited from Sphinx + handled in external environments * Remove mentioning of Jinja2 dependency change * Add Jinja2<3.1 dependecy to affected tox environments
1 parent 2c31b73 commit 7771d05

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

docs/changelog.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ Dependency Changes
1717

1818
Many documentation projects depend on ``sphinx-rtd-theme`` without specifying a version of the theme (unpinned) while also depending on unpinned versions of Sphinx. The latest version of ``sphinx-rtd-theme`` ideally always supports the latest version of Sphinx, but this is now guaranteed.
1919

20-
This release adds upper bounds to direct dependencies ``Sphinx``, ``docutils`` and ``Jinja2``, which will safeguard from mixing with possibly incompatible future versions of Sphinx & friends.
20+
This release adds upper bounds to direct dependencies ``Sphinx`` and ``docutils`` which will safeguard from mixing with possibly incompatible future versions of Sphinx & docutils.
2121

2222
* Sphinx versions supported: 1.6 to 5.2.x
23-
* ``Jinja<3.1`` (#1316)
2423
* ``Sphinx<6`` (#1332)
24+
* ``docutils<0.18`` (unchanged, but will be bumped in an upcoming release)
2525

2626

2727
Features
@@ -38,7 +38,8 @@ Fixes
3838
* Definition lists rendered wrongly in api docs (#1052)
3939
* Citation not styled properly (#1078)
4040

41-
Minor changes
41+
42+
Minor Changes
4243
-------------
4344

4445
* Sphinx 5.2 added to test matrix (#1348)

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
4646
install_requires =
4747
sphinx >=1.6,<6
4848
docutils <0.18
49-
Jinja2 <3.1
5049
tests_require =
5150
pytest
5251

tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ deps =
4141
# Projects using these Sphinx versions will have to do the same
4242
# See: https://github.com/readthedocs/sphinx_rtd_theme/pull/1304
4343
sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42}: docutils<0.18
44+
# External environments are required to add this dependency for older versions of Sphinx
45+
# because it didn't ship with this upper bound.
46+
# See: https://github.com/sphinx-doc/sphinx/issues/10291
47+
sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40}: Jinja2<3.1
4448
sphinxlatest: Sphinx
4549
sphinxdev: https://github.com/sphinx-doc/sphinx/archive/refs/heads/master.zip
4650
commands =

0 commit comments

Comments
 (0)