Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install sphinx 4.1-dev from git #1419

Merged
merged 2 commits into from
May 11, 2021
Merged

Install sphinx 4.1-dev from git #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5323b2
Install sphinx 4.1-dev from git
ThiefMaster May 11, 2021
3a9c8f2
Remove type annotation breaking sphinx builds
ThiefMaster May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@ imagesize==1.2.0
# via sphinx
iniconfig==1.1.1
# via pytest
jinja2==2.11.3
jinja2==3.0.0
# via sphinx
markupsafe==1.1.1
# via
# jinja2
# sphinx
markupsafe==2.0.0
# via jinja2
mypy-extensions==0.4.3
# via mypy
mypy==0.812
Expand Down Expand Up @@ -90,7 +88,7 @@ snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
# via -r requirements/docs.in
sphinx==4.0.1
git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3
# via
# -r requirements/docs.in
# pallets-sphinx-themes
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Pallets-Sphinx-Themes
Sphinx
git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3 # https://github.com/sphinx-doc/sphinx/issues/9216
sphinx-issues
sphinxcontrib-log-cabinet
10 changes: 4 additions & 6 deletions requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ idna==2.10
# via requests
imagesize==1.2.0
# via sphinx
jinja2==2.11.3
jinja2==3.0.0
# via sphinx
markupsafe==1.1.1
# via
# jinja2
# sphinx
markupsafe==2.0.0
# via jinja2
packaging==20.9
# via
# pallets-sphinx-themes
Expand All @@ -42,7 +40,7 @@ snowballstemmer==2.1.0
# via sphinx
sphinx-issues==1.2.0
# via -r requirements/docs.in
sphinx==4.0.1
git+https://github.com/sphinx-doc/sphinx.git@96dbe5e3
# via
# -r requirements/docs.in
# pallets-sphinx-themes
Expand Down
2 changes: 1 addition & 1 deletion src/jinja2/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ def __new__(
finalize: t.Optional[t.Callable[..., t.Any]] = None,
autoescape: t.Union[bool, t.Callable[[t.Optional[str]], bool]] = False,
enable_async: bool = False,
) -> "Template":
) -> t.Any: # it returns a `Template`, but this breaks the sphinx build...
env = get_spontaneous_environment(
cls.environment_class, # type: ignore
block_start_string,
Expand Down