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

bump sphinx-jinja #22101

Merged
merged 2 commits into from
Mar 9, 2022
Merged

bump sphinx-jinja #22101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31faabd
bump sphinx-jinja
eladkal Mar 8, 2022
c135dd1
Update docs/conf.py
eladkal Mar 8, 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
10 changes: 5 additions & 5 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
if PACKAGE_NAME == 'apache-airflow':
extensions.extend(
[
'sphinxcontrib.jinja',
'sphinx_jinja',
'sphinx.ext.graphviz',
'sphinxcontrib.httpdomain',
'sphinxcontrib.httpdomain',
Expand All @@ -164,13 +164,13 @@
if PACKAGE_NAME == "apache-airflow-providers":
extensions.extend(
[
'sphinxcontrib.jinja',
'sphinx_jinja',
'operators_and_hooks_ref',
'providers_packages_ref',
]
)
elif PACKAGE_NAME == "helm-chart":
extensions.append("sphinxcontrib.jinja")
extensions.append("sphinx_jinja")
elif PACKAGE_NAME == "docker-stack":
# No extra extensions
pass
Expand All @@ -188,7 +188,7 @@
elif PACKAGE_NAME.startswith('apache-airflow-providers-'):
extensions.extend(
[
'sphinxcontrib.jinja',
'sphinx_jinja',
]
)
exclude_patterns = ['operators/_partials']
Expand Down Expand Up @@ -361,7 +361,7 @@ def _get_rst_filepath_from_path(filepath: str):

# == Extensions configuration ==================================================

# -- Options for sphinxcontrib.jinjac ------------------------------------------
# -- Options for sphinx_jinjac ------------------------------------------
eladkal marked this conversation as resolved.
Show resolved Hide resolved
# See: https://github.com/tardyp/sphinx-jinja

# Jinja context
Expand Down
2 changes: 1 addition & 1 deletion docs/exts/providers_packages_ref.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def _on_config_inited(app, config):

def setup(app: Sphinx):
"""Setup plugin"""
app.setup_extension('sphinxcontrib.jinja')
app.setup_extension('sphinx_jinja')
app.connect("config-inited", _on_config_inited)
app.add_crossref_type(
directivename="provider",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version
'sphinx-argparse>=0.1.13',
'sphinx-autoapi>=1.8.0',
'sphinx-copybutton',
'sphinx-jinja>=1.1',
'sphinx-jinja>=2.0',
'sphinx-rtd-theme>=0.1.6',
'sphinxcontrib-httpdomain>=1.7.0',
'sphinxcontrib-redoc>=1.6.0',
Expand Down