Skip to content

Commit 9cb1004

Browse files
dgarcia360fruch
authored andcommitted
docs: update theme 1.6
docs: remove unused deps docs: update deps docs: update deps docs: update deps docs: update deps docs: update deps Delete .eggs/README.txt docs: update deps fix: warning
1 parent 64e7fad commit 9cb1004

6 files changed

Lines changed: 25 additions & 30 deletions

File tree

.github/workflows/docs-pages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Python
2323
uses: actions/setup-python@v3
2424
with:
25-
python-version: 3.7
25+
python-version: 3.9
2626
- name: Set up env
2727
run: make -C docs setupenv
2828
- name: Build driver

.github/workflows/docs-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Python
2222
uses: actions/setup-python@v3
2323
with:
24-
python-version: 3.7
24+
python-version: 3.9
2525
- name: Set up env
2626
run: make -C docs setupenv
2727
- name: Build driver

docs/Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Global variables
22
# You can set these variables from the command line.
33
POETRY = poetry
4-
SPHINXOPTS =
4+
SPHINXOPTS = -j auto
55
SPHINXBUILD = $(POETRY) run sphinx-build
66
PAPER =
77
BUILDDIR = _build
@@ -13,11 +13,6 @@ PAPEROPT_letter = -D latex_paper_size=letter
1313
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR)
1414
TESTSPHINXOPTS = $(ALLSPHINXOPTS) -W --keep-going
1515

16-
# Windows variables
17-
ifeq ($(OS),Windows_NT)
18-
POETRY = $(APPDATA)\Python\Scripts\poetry
19-
endif
20-
2116
.PHONY: all
2217
all: dirhtml
2318

docs/api/cassandra/cluster.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215

216216
.. automethod:: add_errback(fn, *args, **kwargs)
217217

218-
.. automethod:: add_callbacks(callback, errback, callback_args=(), callback_kwargs=None, errback_args=(), errback_args=None)
218+
.. automethod:: add_callbacks(callback, errback, callback_args=(), callback_kwargs=None, errback_args=(), errback_kwargs=None)
219219

220220
.. autoclass:: ResultSet ()
221221
:members:

docs/conf.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# -*- coding: utf-8 -*-
22
import os
33
import sys
4-
from datetime import date
54

65
from sphinx_scylladb_theme.utils import multiversion_regex_builder
76

87
sys.path.insert(0, os.path.abspath('..'))
98
import cassandra
109

11-
# -- General configuration -----------------------------------------------------
10+
# -- Global variables
1211

1312
# Build documentation for the following tags and branches
1413
TAGS = ['3.21.0-scylla', '3.22.3-scylla', '3.24.8-scylla', '3.25.4-scylla', '3.25.11-scylla', '3.26.3-scylla']
@@ -20,6 +19,8 @@
2019
# Set which versions are deprecated
2120
DEPRECATED_VERSIONS = ['']
2221

22+
# -- General configuration
23+
2324
# Add any Sphinx extension module names here, as strings. They can be extensions
2425
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
2526
extensions = [
@@ -69,15 +70,15 @@
6970
# The name of the Pygments (syntax highlighting) style to use.
7071
pygments_style = 'sphinx'
7172

72-
# -- Options for not found extension -------------------------------------------
73+
# -- Options for not found extension
7374

7475
# Template used to render the 404.html generated by this extension.
7576
notfound_template = '404.html'
7677

7778
# Prefix added to all the URLs generated in the 404 page.
7879
notfound_urls_prefix = ''
7980

80-
# -- Options for multiversion --------------------------------------------------
81+
# -- Options for multiversion
8182

8283
# Whitelist pattern for tags
8384
smv_tag_whitelist = multiversion_regex_builder(TAGS)
@@ -94,16 +95,16 @@
9495
# Format for versioned output directories inside the build directory
9596
smv_outputdir_format = '{ref.name}'
9697

97-
# -- Options for HTML output --------------------------------------------------
98+
# -- Options for sitemap extension
99+
100+
sitemap_url_scheme = "/stable/{link}"
101+
102+
# -- Options for HTML output
98103

99104
# The theme to use for HTML and HTML Help pages. See the documentation for
100105
# a list of builtin themes.
101106
html_theme = 'sphinx_scylladb_theme'
102107

103-
# -- Options for sitemap extension ---------------------------------------
104-
105-
sitemap_url_scheme = "/stable/{link}"
106-
107108
# Theme options are theme-specific and customize the look and feel of a theme
108109
# further. For a list of options available for each theme, see the
109110
# documentation.

docs/pyproject.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@ description = "ScyllaDB Python Driver Docs"
55
authors = ["Python Driver Contributors"]
66

77
[tool.poetry.dependencies]
8-
dnspython = "2.2.1"
9-
eventlet = "0.25.2"
8+
eventlet = "^0.33.3"
109
futures = "2.2.0"
11-
geomet = "0.1.2"
12-
gevent = "20.12.1"
10+
geomet = ">=0.1,<0.3"
11+
gevent = "^23.9.1"
1312
gremlinpython = "3.4.7"
14-
python = "^3.7"
15-
pyyaml = "6.0"
13+
python = "^3.9"
14+
pyyaml = "6.0.1"
1615
pygments = "2.15.1"
1716
recommonmark = "0.7.1"
1817
redirects_cli ="~0.1.2"
1918
sphinx-autobuild = "2021.3.14"
20-
sphinx-sitemap = "2.5.0"
21-
sphinx-scylladb-theme = "~1.5.1"
22-
sphinx-multiversion-scylla = "~0.2.11"
23-
Sphinx = "4.3.2"
24-
scales = "1.0.9"
25-
six = "1.15.0"
19+
sphinx-sitemap = "2.5.1"
20+
sphinx-scylladb-theme = "~1.6.1"
21+
sphinx-multiversion-scylla = "~0.3.1"
22+
Sphinx = "7.2.6"
23+
scales = "^1.0.9"
24+
six = ">=1.9"
2625

2726
[build-system]
2827
requires = ["poetry>=0.12"]

0 commit comments

Comments
 (0)