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

Fix jinja2 pinning on Sphinx 1.8 feature flagged projects #9036

Merged
merged 2 commits into from
Mar 29, 2022
Merged

Fix jinja2 pinning on Sphinx 1.8 feature flagged projects #9036

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f60e5d
Fix jinja2 pinning on Sphinx 1.8 feature flagged projects
ericholscher Mar 24, 2022
26a8742
Fix logic
ericholscher Mar 24, 2022
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
6 changes: 4 additions & 2 deletions readthedocs/doc_builder/python_environments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import codecs
import copy
import itertools
import structlog
import os
import tarfile

import structlog
import yaml
from django.conf import settings

Expand Down Expand Up @@ -344,6 +344,8 @@ def install_core_requirements(self):
negative='readthedocs-sphinx-ext<2.2',
),
])
if not self.project.has_feature(Feature.USE_SPHINX_LATEST):
requirements.extend(["jinja2<3.1.0"])

cmd = copy.copy(pip_install_cmd)
if self.config.python.use_system_site_packages:
Expand Down Expand Up @@ -498,7 +500,7 @@ def _install_mamba(self):

def setup_base(self):
conda_env_path = os.path.join(self.project.doc_path, 'conda')
version_path = os.path.join(conda_env_path, self.version.slug)
os.path.join(conda_env_path, self.version.slug)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line seems can be completely removed because we are not assigning it to any variable.


if self.project.has_feature(Feature.UPDATE_CONDA_STARTUP):
self._update_conda_startup()
Expand Down