Run sphinx in a tox environment

cderici · cderici · commit b301bdd9e062 · 2023-07-14T10:49:53.000-06:00
diff --git a/Makefile b/Makefile
@@ -24,17 +24,13 @@ test: lint
 	tox -e py3
 	tox -e integration
 
-
 .PHONY: lint
 lint: 
 	tox -e lint
 
 .PHONY: docs
-docs: .tox
-	$(PIP) install -r docs/requirements.txt
-	rm -rf docs/_build/
-	$(BIN)/sphinx-build -b html docs/  docs/_build/
-	cd docs/_build/ && zip -r docs.zip *
+docs:
+	tox -e docs
 
 .PHONY: release
 release:
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,5 +1,15 @@
-pytz<2018.0,>=2017.2  # conflict between sphinx and macaroonbakery
-pymacaroons>=0.13.0,<1.0  # force new version with pynacl instead of libnacl
-sphinx==1.6.5
+pytz
+pymacaroons
+sphinx==4.3.2
 sphinxcontrib-asyncio
 sphinx_rtd_theme
+websockets
+typing-inspect
+pyyaml
+pyasn1
+pyrfc3339
+paramiko
+macaroonbakery
+toposort
+python-dateutil
+kubernetes
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = lint,py3,py38,py39,py310
+envlist = lint,py3,py38,py39,py310,docs
 skipsdist=True
 
 [pytest]
@@ -42,6 +42,15 @@ deps =
     kubernetes
     cffi
 
+[testenv:docs]
+deps =
+    -r docs/requirements.txt
+
+allowlist_externals = rm
+commands =
+    rm -rf docs/_build/
+    sphinx-build -b html docs/ docs/_build/
+
 [testenv:lint]
 commands =
     flake8 {posargs} juju tests examples
