Skip to content

Commit 2cf6474

Browse files
dgarcia360dependabot[bot]annastuchlik
authored
Sync release (#1535)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anna Stuchlik <anna.stuchlik@scylladb.com> Fixes #1513
2 parents c231fc9 + 68b5d1b commit 2cf6474

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+6238
-1540
lines changed

.github/workflows/codeql-analysis.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v5
41+
uses: actions/checkout@v6
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v3
45+
uses: github/codeql-action/init@v4
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
5353
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5454
# If this step fails, then you should remove it and run the build manually (see below)
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v3
56+
uses: github/codeql-action/autobuild@v4
5757

5858
# ℹ️ Command-line programs to run using the OS shell.
5959
# 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
6767
# make release
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v3
70+
uses: github/codeql-action/analyze@v4

.github/workflows/docs-links.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616
with:
1717
persist-credentials: false
1818
fetch-depth: 0
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@v2.6.1
22+
uses: lycheeverse/lychee-action@v2.7.0
2323
with:
2424
args: --verbose --no-progress './**/*.md' './**/*.rst'
2525
env:
2626
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2727

2828
- name: Create Issue From File
2929
if: ${{ steps.lychee.outputs.exit_code != 0 }}
30-
uses: peter-evans/create-issue-from-file@v4
30+
uses: peter-evans/create-issue-from-file@v6
3131
with:
3232
title: Link Checker Report
3333
content-filepath: ./lychee/out.md

.github/workflows/docs-pages.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020
with:
2121
ref: ${{ github.event.repository.default_branch }}
2222
persist-credentials: false
2323
fetch-depth: 0
2424
- name: Set up Python
25-
uses: actions/setup-python@v5
25+
uses: actions/setup-python@v6
2626
with:
2727
python-version: '3.10'
2828

@@ -44,7 +44,7 @@ jobs:
4444
.
4545
4646
- name: Upload artifact
47-
uses: actions/upload-artifact@v4.6.2
47+
uses: actions/upload-artifact@v5.0.0
4848
with:
4949
name: github-pages
5050
path: ${{ runner.temp }}/artifact.tar

.github/workflows/docs-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818
with:
1919
persist-credentials: false
2020
fetch-depth: 0
2121

2222
- name: Set up Python
23-
uses: actions/setup-python@v5
23+
uses: actions/setup-python@v6
2424
with:
2525
python-version: '3.10'
2626

.github/workflows/multiversion-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
working-directory: ./extensions/sphinx-multiversion
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424
with:
2525
persist-credentials: false
2626
fetch-depth: 0
2727

2828
- name: Set up Python
29-
uses: actions/setup-python@v5
29+
uses: actions/setup-python@v6
3030
with:
3131
python-version: '3.10'
3232

.github/workflows/theme-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121
with:
2222
persist-credentials: false
2323
fetch-depth: 0
2424

2525
- name: Set up Python
26-
uses: actions/setup-python@v5
26+
uses: actions/setup-python@v6
2727
with:
2828
python-version: "3.10"
2929

docs/source/conf.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from sphinx_scylladb_theme.utils import multiversion_regex_builder
88

99
sys.path.insert(0, os.path.abspath(".."))
10+
sys.path.insert(0, os.path.abspath("."))
1011

1112
# -- Global variables
1213

@@ -46,6 +47,7 @@
4647
"sphinx_scylladb_theme",
4748
"sphinx_multiversion", # optional
4849
"myst_parser", # optional
50+
"breathe", # optional
4951
]
5052

5153
# The suffix(es) of source filenames.
@@ -71,6 +73,23 @@
7173
.. |rst| replace:: restructuredText
7274
"""
7375

76+
# -- Options for autodoc extension ----------------------------------
77+
78+
# Configure autodoc to show better signatures
79+
autodoc_typehints = "description"
80+
autodoc_member_order = "bysource"
81+
add_module_names = False # Don't prepend module names to class/function names
82+
83+
# -- Options for breathe extension ----------------------------------
84+
85+
breathe_projects = {
86+
"SampleModule": os.path.join(
87+
os.path.dirname(__file__), "examples/doxygen_output/xml"
88+
)
89+
}
90+
breathe_default_project = "SampleModule"
91+
breathe_default_members = ("members", "undoc-members")
92+
7493
# -- Options for myst parser ----------------------------------------
7594
myst_enable_extensions = ["colon_fence"]
7695

docs/source/configuration/ai-chatbot.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ScyllaDB Docs integrates with `Biel.ai <https://biel.ai/>`_ to offer a conversat
77
The chatbot can answer documentation-related questions and provide relevant links to help users find the information they need quickly.
88

99
.. note::
10-
This feature is in beta and disabled by default. It will be gradually enabled for all documentation sites in a future release.
10+
This feature is in beta and disabled by default. It will be gradually enabled for all documentation sites in a future release.
1111
If you want to enable it now, please contact us in Slack (``#scylla-docs`` channel).
1212

1313
Installation
@@ -24,7 +24,7 @@ To enable the AI chatbot, update your ``conf.py`` file by setting ``hide_ai_chat
2424
Usage
2525
-----
2626

27-
Once enabled, the Ask AI button will appear in the documentation interface.
27+
Once enabled, the Ask AI button will appear in the documentation interface.
2828
Users can click the button to start a conversation, ask questions, and receive responses with relevant documentation links.
2929

3030
.. figure:: images/ai-chatbot.png
@@ -61,4 +61,3 @@ If the chatbot does not appear:
6161
* Check for errors in the browser console that may indicate issues with the integration.
6262

6363
For more details, refer to the `Biel.ai documentation <https://docs.biel.ai/>`_.
64-

docs/source/configuration/page.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,17 @@ If set, hides the secondary sidebar from the page.
8080
8181
:hide-secondary-sidebar:
8282
83+
TOC depth
84+
---------
85+
86+
Sets the depth of the table of contents in the secondary sidebar ("On This Page").
87+
88+
Valid values are 2, 3, or 4. Default is 2.
89+
90+
.. code-block:: none
91+
92+
:toc-depth: 3
93+
8394
Hide version warning
8495
--------------------
8596

docs/source/configuration/template.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,10 @@ Configuration options for the left sidebar.
226226
- number
227227
- -1
228228
- The maximum depth of the sidebar nested entries. Set to `-1` to allow unlimited depth.
229+
* - ``secondary_sidebar_toc_depth``
230+
- number
231+
- 2
232+
- The depth of the table of contents in the secondary sidebar ("On This Page"). Valid values: 2-4. Can be overridden per-page with ``:toc-depth:`` meta option.
229233
* - ``theme``
230234
- string
231235
- product
@@ -238,6 +242,7 @@ Example:
238242
html_theme_options = {
239243
'collapse_navigation': 'false',
240244
'navigation_depth': '-1',
245+
'secondary_sidebar_toc_depth': 3,
241246
'theme': 'product',
242247
}
243248
@@ -306,7 +311,7 @@ Configuration options for enabling zendesk.
306311
- Description
307312
* - ``zendesk_tag``
308313
- string
309-
-
314+
-
310315
- Zendesk verification tag. Example: ``gq6ltsh3nfex3cnwfy4aj9``.
311316

312317
.. code:: python
@@ -329,6 +334,5 @@ Multiversion options
329334
- Description
330335
* - ``redirect``
331336
- string
332-
-
337+
-
333338
- Overrides the default redirection of the main domain when using multiversion. By default, it redirects to ``<DOMAIN>/stable/``. Overriding setting this can be useful if the main domain page publishes multiple documentation sets. Example: ``/manual/stable/``.
334-

0 commit comments

Comments
 (0)