Run Makefile targets under poetry

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
       - run:
           name: Run lint
           command: |
-            poetry run make docs-lint
+            make docs-lint
 
   linkcheck:
     docker:
@@ -32,7 +32,7 @@ jobs:
       - run:
           name: Run link check
           command: |
-            poetry run make docs-linkcheck
+            make docs-linkcheck
 
   build:
     docker:

Makefile

@@ -1,23 +1,25 @@
+# All targets are run under poetry, so the activation of the virtual environment
+# is not necessary.
 .PHONY: docs
 docs:  ## Build project documentation with live reload for editing.
 	@echo "███ Building docs and watching for changes..."
-	make clean && sphinx-autobuild docs docs/_build/html
+	@poetry run make clean && poetry run sphinx-autobuild docs docs/_build/html
 	@echo
 
 .PHONY: docs-lint
 docs-lint:  ## Check documentation for common syntax errors.
 	@echo "███ Linting documentation..."
 # The `-W` option converts warnings to errors.
 # The `-n` option enables "nit-picky" mode.
-	@make clean && sphinx-build -Wn docs docs/_build/html
+	@make clean && poetry run sphinx-build -Wn docs docs/_build/html
 	@echo
 
 .PHONY: docs-linkcheck
 docs-linkcheck:  ## Check documentation for broken links.
-	@make clean && sphinx-build -b linkcheck -Wn docs docs/_build/html
+	@make clean && poetry run sphinx-build -b linkcheck -Wn docs docs/_build/html
 	@echo
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %:
-	@sphinx-build -M $@ docs docs/_build
+	@poetry run sphinx-build -M $@ docs docs/_build

README.md

@@ -10,5 +10,4 @@ This repository holds the [documentation](https://support-docs.securedrop.org/)
 
 1. [Install poetry](https://python-poetry.org/docs/#installation)
 2. Install the dependencies using `poetry install`
-3. Enter the virtual environment using `poetry shell`
-4. Run `make docs` to preview the documentation.
+3. Run `make docs` to preview the documentation.

deploy/Dockerfile

@@ -7,7 +7,7 @@ COPY ./ .
 RUN pip install --upgrade pip
 RUN pip install poetry
 RUN poetry install
-RUN poetry run deploy/build $GIT_BRANCH
+RUN deploy/build $GIT_BRANCH
 
 # sha256 as of 2023-01-09