Skip to content

Commit 4ba0657

Browse files
authored
chore: update theme 1.8.3 (#367)
docs: update workflows fix: java version fix: java version fix: java version
1 parent abe2811 commit 4ba0657

File tree

8 files changed

+1348
-20
lines changed

8 files changed

+1348
-20
lines changed

.github/dependabot.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "pip"
4+
directory: "/docs"
5+
schedule:
6+
interval: "daily"
7+
allow:
8+
- dependency-name: "sphinx-scylladb-theme"
9+
- dependency-name: "sphinx-multiversion-scylla"

.github/workflows/docs-pages.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
push:
77
branches:
88
- scylla-3.x
9-
- 'branch-**'
9+
- 'scylla-**'
1010
paths:
1111
- 'docs/**'
1212
- 'faq/**'
@@ -30,9 +30,10 @@ jobs:
3030
with:
3131
python-version: '3.10'
3232
- name: Set up JDK 1.8
33-
uses: actions/setup-java@v1
33+
uses: actions/setup-java@v4
3434
with:
35-
java-version: 1.8
35+
java-version: '8'
36+
distribution: 'adopt'
3637
- name: Set up env
3738
run: make -C docs setupenv
3839
- name: Build redirects

.github/workflows/docs-pr.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,27 @@ on:
1515

1616
jobs:
1717
build:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-20.04
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v4
2222
with:
2323
persist-credentials: false
2424
fetch-depth: 0
25+
2526
- name: Set up Python
2627
uses: actions/setup-python@v5
2728
with:
2829
python-version: '3.10'
30+
2931
- name: Set up JDK 1.8
30-
uses: actions/setup-java@v1
32+
uses: actions/setup-java@v4
3133
with:
32-
java-version: 1.8
34+
java-version: '8'
35+
distribution: 'adopt'
36+
3337
- name: Set up env
3438
run: make -C docs setupenv
39+
3540
- name: Build docs
36-
run: make -C docs test
41+
run: make -C docs test

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ latex
1717
.documenter_local_last_run
1818
docs/_build
1919
docs/_source
20-
docs/poetry.lock
2120
target/
2221
dependency-reduced-pom.xml

docs/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ setupenv:
2424
.PHONY: setup
2525
setup:
2626
$(POETRY) install
27-
$(POETRY) update
2827
@if [ ! -d "$(SOURCEDIR)" ]; then mkdir -p "$(SOURCEDIR)"; fi
2928
cp -RL source/* $(SOURCEDIR)
3029
cd $(SOURCEDIR) && find . -name README.md -execdir mv '{}' index.md ';'
3130

31+
.PHONY: update
32+
update:
33+
$(POETRY) update
34+
3235
# Clean commands
3336
.PHONY: pristine
3437
pristine: clean

docs/poetry.lock

Lines changed: 1310 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/pyproject.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ name = "java-driver"
33
version = "3.7.1"
44
description = "ScyllaDB Java Driver"
55
authors = ["Java Driver Contributors"]
6+
package-mode = false
67

78
[tool.poetry.dependencies]
8-
python = "^3.9"
9-
pyyaml = "6.0.1"
10-
pygments = "2.15.1"
11-
redirects_cli ="~0.1.3"
12-
sphinx-scylladb-theme = "~1.7.2"
13-
sphinx-sitemap = "2.5.1"
14-
sphinx-autobuild = "2021.3.14"
15-
Sphinx = "7.2.6"
16-
sphinx-multiversion-scylla = "~0.3.1"
9+
python = "^3.10"
10+
pygments = "^2.18.0"
11+
redirects_cli ="^0.1.3"
12+
sphinx-scylladb-theme = "^1.8.1"
13+
sphinx-sitemap = "^2.6.0"
14+
sphinx-autobuild = "^2024.4.19"
15+
Sphinx = "^7.3.7"
16+
sphinx-multiversion-scylla = "^0.3.1"
1717
wheel = "^0.38.4"
1818
sphinx-scylladb-markdown = "^0.1.2"
1919

2020
[build-system]
21-
requires = ["poetry>=0.12"]
22-
build-backend = "poetry.masonry.api"
21+
requires = ["poetry>=1.8"]
22+
build-backend = "poetry.masonry.api"

docs/source/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
'conf_py_path': 'docs/source/',
139139
'branch_substring_removed': 'scylla-',
140140
'github_repository': 'scylladb/java-driver',
141+
'default_branch': 'scylla-4.x',
141142
'github_issues_repository': 'scylladb/java-driver',
142143
'hide_edit_this_page_button': 'false',
143144
'hide_feedback_buttons': 'false',

0 commit comments

Comments
 (0)