temporary: roll back some stuff to verify

Author: Bouncheck

docs/Makefile

@@ -1,108 +1,89 @@
 # You can set these variables from the command line.
-POETRY        = poetry
-SPHINXOPTS    = -j auto
+POETRY        = $(HOME)/.poetry/bin/poetry
+SPHINXOPTS    =
 SPHINXBUILD   = $(POETRY) run sphinx-build
 PAPER         =
 BUILDDIR      = _build
-SOURCEDIR     = _source
+SOURCE_DIR    = _source
 
-# Internal variables
+# Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR)
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCE_DIR)
 TESTSPHINXOPTS  = $(ALLSPHINXOPTS) -W --keep-going
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR)
+
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 .PHONY: all
 all: dirhtml
 
-# Setup commands
-.PHONY: setupenv
-setupenv:
-	pip install -q poetry
-
-.PHONY: setup
-setup:
-	$(POETRY) install
-	@if [ ! -d "$(SOURCEDIR)" ]; then mkdir -p "$(SOURCEDIR)"; fi
-	cp -RL source/* $(SOURCEDIR)
-	cd $(SOURCEDIR) && find . -name README.md -execdir mv '{}' index.md ';'
-
-.PHONY: update
-update:
-	$(POETRY) update
-
-# Clean commands
 .PHONY: pristine
 pristine: clean
 	git clean -dfX
 
+.PHONY: setup
+setup:
+	./_utils/setup.sh
+	cp -TLr source $(SOURCE_DIR)
+	cd $(SOURCE_DIR) && find . -name README.md -execdir mv '{}' index.md ';'
 .PHONY: clean
 clean:
 	rm -rf $(BUILDDIR)/*
-	rm -rf $(SOURCEDIR)/*
-	rm -f poetry.lock
+	rm -rf $(SOURCE_DIR)/*
+
+.PHONY: preview
+preview: setup
+	cd .. && ./docs/_utils/javadoc.sh
+	$(POETRY) run sphinx-autobuild -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml --port 5500
 
-# Generate output commands
 .PHONY: dirhtml
 dirhtml: setup
-	@$(javadoc)
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
-.PHONY: javadoc
-javadoc: setup
-	cd .. && ./docs/_utils/javadoc.sh
+.PHONY: singlehtml
+singlehtml: setup
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
 
-.PHONY: multiversion
-multiversion: setup
-	$(POETRY) run ./_utils/multiversion.sh
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
 .PHONY: epub
-epub: setup
+epub: 	setup
 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
 .PHONY: epub3
-epub3:setup
+epub3:	setup
 	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
 	@echo
 	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
 
 .PHONY: dummy
-dummy: setup
+dummy: 	setup
 	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
 	@echo
 	@echo "Build finished. Dummy builder generates no files."
 
-# Preview commands
-.PHONY: preview
-preview: setup
-	$(POETRY) run sphinx-autobuild -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml --port 5500 --re-ignore 'api/*'
-
-.PHONY: multiversionpreview
-multiversionpreview: multiversion
-	$(POETRY) run python -m http.server 5500 --directory $(BUILDDIR)/dirhtml
+.PHONY: linkcheck
+linkcheck: setup
+	$(SPHINXBUILD) -b linkcheck $(SOURCE_DIR) $(BUILDDIR)/linkcheck
 
-.PHONY: redirects
-redirects: setup
-	$(POETRY) run redirects-cli fromfile --yaml-file _utils/redirects.yaml --output-dir $(BUILDDIR)/dirhtml
+.PHONY: multiversion
+multiversion: setup
+	@mkdir -p $(HOME)/.cache/pypoetry/virtualenvs
+	$(POETRY) run ./_utils/multiversion.sh
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
-# Test commands
+.PHONY: multiversionpreview
+multiversionpreview: multiversion
+	$(POETRY) run python3 -m http.server 5500 --directory $(BUILDDIR)/dirhtml
+
 .PHONY: test
 test: setup
 	$(SPHINXBUILD) -b dirhtml $(TESTSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-.PHONY: linkcheck
-linkcheck: setup
-	$(SPHINXBUILD) -b linkcheck $(SOURCEDIR) $(BUILDDIR)/linkcheck
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."

docs/_utils/javadoc.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Install dependencies
-mvn install -DskipTests -T 1C
+mvn install -DskipTests
 
 # Define output folder
 OUTPUT_DIR="docs/_build/dirhtml/api"
@@ -11,7 +11,7 @@ if [[ "$SPHINX_MULTIVERSION_OUTPUTDIR" != "" ]]; then
 fi
 
 # Generate javadoc
-mvn javadoc:javadoc -T 1C
+mvn javadoc:javadoc
 [ -d $OUTPUT_DIR ] && rm -r $OUTPUT_DIR
 mkdir -p "$OUTPUT_DIR"
 mv -f core/target/site/apidocs/* $OUTPUT_DIR

docs/_utils/multiversion.sh

@@ -1,5 +1,5 @@
 #! /bin/bash	
 
 cd .. && sphinx-multiversion docs/source docs/_build/dirhtml \
-    --pre-build "find . -mindepth 2 -name README.md -execdir mv '{}' index.md ';'" \
-    --post-build './docs/_utils/javadoc.sh'
+    --pre-build './docs/_utils/javadoc.sh' \
+    --pre-build "find . -mindepth 2 -name README.md -execdir mv '{}' index.md ';'"

docs/pyproject.toml

@@ -3,20 +3,21 @@ name = "java-driver"
 version = "3.7.1"
 description = "ScyllaDB Java Driver"
 authors = ["Java Driver Contributors"]
-package-mode = false
 
 [tool.poetry.dependencies]
-python = "^3.10"
-pygments = "^2.18.0"
-redirects_cli ="^0.1.3"
-sphinx-scylladb-theme = "^1.8.6"
-sphinx-sitemap = "^2.6.0"
-sphinx-autobuild = "^2024.4.19"
-Sphinx = "^7.3.7"
-sphinx-multiversion-scylla = "^0.3.1"
-wheel = "^0.38.4"
-sphinx-scylladb-markdown = "^0.1.2"
+python = "^3.7"
+pyyaml = "5.3"
+pygments = "2.2.0"
+recommonmark = "0.5.0"
+sphinx-scylladb-theme = "~1.0.0"
+sphinx-sitemap = "2.1.0"
+sphinx-autobuild = "0.7.1"
+Sphinx = "2.4.4"
+sphinx-multiversion-scylla = "~0.2.6"
+
+[tool.poetry.dev-dependencies]
+pytest = "5.2"
 
 [build-system]
-requires = ["poetry>=1.8"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"