build(docs): re-enable docs packages we couldn't install

Author: nedbat

Makefile

@@ -117,6 +117,9 @@ _upgrade:
 
 doc_upgrade: export CUSTOM_COMPILE_COMMAND=make doc_upgrade
 doc_upgrade: $(DOCBIN)			## Update the doc/requirements.pip file
+	@# I don't understand why, but pip-tools won't update versions in this
+	@# .pip file unless I remove it first:
+	rm doc/requirements.pip
 	$(DOCBIN)/pip install -q -r requirements/pip-tools.pip
 	$(DOCBIN)/$(PIP_COMPILE) -o doc/requirements.pip doc/requirements.in
 
@@ -254,7 +257,8 @@ docdev: dochtml				## Build docs, and auto-watch for changes.
 	PATH=$(DOCBIN):$(PATH) $(SPHINXAUTOBUILD) -b html doc doc/_build/html
 
 docspell: $(DOCBIN)			## Run the spell checker on the docs.
-	$(SPHINXBUILD) -b spelling doc doc/_spell
+	# Very mac-specific...
+	PYENCHANT_LIBRARY_PATH=/opt/homebrew/lib/libenchant-2.dylib $(SPHINXBUILD) -b spelling doc doc/_spell
 
 
 ##@ Publishing docs

doc/requirements.in

@@ -7,14 +7,12 @@
 -c ../requirements/pins.pip
 
 cogapp
+doc8
+pyenchant
 scriv       # for writing GitHub releases
 sphinx
 sphinx-autobuild
 sphinx_rtd_theme
 sphinx-code-tabs
 sphinxcontrib-restbuilder
-
-# These aren't compatible atm with other library versions:
-doc8
-#pyenchant
-#sphinxcontrib-spelling
+sphinxcontrib-spelling

doc/requirements.pip

@@ -52,6 +52,10 @@ packaging==23.2
     # via sphinx
 pbr==6.0.0
     # via stevedore
+pyenchant==3.2.2
+    # via
+    #   -r doc/requirements.in
+    #   sphinxcontrib-spelling
 pygments==2.17.2
     # via
     #   doc8
@@ -76,6 +80,7 @@ sphinx==7.2.6
     #   sphinx-rtd-theme
     #   sphinxcontrib-jquery
     #   sphinxcontrib-restbuilder
+    #   sphinxcontrib-spelling
 sphinx-autobuild==2024.2.4
     # via -r doc/requirements.in
 sphinx-code-tabs==0.5.5
@@ -98,6 +103,8 @@ sphinxcontrib-restbuilder==0.3
     # via -r doc/requirements.in
 sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
+sphinxcontrib-spelling==8.0.0
+    # via -r doc/requirements.in
 stevedore==5.2.0
     # via doc8
 tornado==6.4