Merge remote-tracking branch 'upstream/main' into easier_access_to_shard_awareness_api

Author: Ten0

.github/workflows/authenticate_test.yml

@@ -13,6 +13,7 @@ env:
 jobs:
   # PasswordAuthenticator
   build:
+    timeout-minutes: 60
     runs-on: ubuntu-latest
     services:
       scylladb:

.github/workflows/book.yml

@@ -14,6 +14,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     services:
       scylladb:
         image: scylladb/scylla

.github/workflows/cassandra.yml

@@ -14,6 +14,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v2
     - name: Setup 3-node Cassandra cluster

.github/workflows/docs-pages.yaml

@@ -13,6 +13,7 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/docs-pr.yaml

@@ -12,6 +12,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/rust.yml

@@ -15,6 +15,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v2
     - name: Setup 3-node Scylla cluster

.github/workflows/serverless.yaml

@@ -12,13 +12,12 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    # ccm requires Python 2 when creating a serverless cluster.
+    # Python 2 is pre-installed on Ubuntu 20.04.
+    runs-on: ubuntu-20.04
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Python 2.7
-        uses: actions/setup-python@v2
-        with:
-          python-version: '2.7'
       - name: Install scylla-ccm
         run: pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
 

.github/workflows/tls.yml

@@ -13,17 +13,18 @@ env:
 jobs:
   tls:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     services:
       scylladb:
         image: scylladb/scylla-tls
         ports:
           - 9042:9042
           - 9142:9142
-        options: 
-          --health-cmd "cqlsh --debug" 
-          --health-interval 5s 
+        options:
+          --health-cmd "cqlsh --debug"
+          --health-interval 5s
           --health-retries 10
-    env: 
+    env:
       working-directory: ./scylla
     steps:
     - uses: actions/checkout@v2

docs/Makefile

@@ -41,6 +41,7 @@ pristine: clean
 .PHONY: clean
 clean:
 	rm -rf $(BUILDDIR)/*
+	rm -rf $(SOURCEDIR)/*
 	rm -f poetry.lock
 
 # Generate output commands

docs/pyproject.toml

@@ -1,17 +1,17 @@
 [tool.poetry]
 name = "sphinx-docs"
 description = "ScyllaDB Documentation"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["ScyllaDB Documentation Contributors"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
 pyyaml = "6.0"
-pygments = "2.11.2"
+pygments = "2.15.1"
 recommonmark = "0.7.1"
 redirects_cli ="~0.1.2"
-sphinx-scylladb-theme = "~1.4.1"
-sphinx-sitemap = "2.2.0"
+sphinx-scylladb-theme = "~1.5.1"
+sphinx-sitemap = "2.5.0"
 sphinx-autobuild = "2021.3.14"
 Sphinx = "4.3.2"
 sphinx-multiversion-scylla = "~0.2.11"