Use "python" in the virtual env, "python3" outside

EliahKagan · EliahKagan · commit b54c34647bf6 · 2023-09-13T06:48:20.000-04:00
This changes the build command to run with "python" when in a
virtual environment, since all virtual environments support this
even when "python" outside it is absent or refers to the wrong
version.

On Windows, virtual environments don't contain a python3 command,
but a global python3 command may be present, so the errors are
confusing. This fixes that by avoiding such errors altogether.
diff --git a/Makefile b/Makefile
@@ -23,10 +23,13 @@ force_release: clean
 	test -z "$$VIRTUAL_ENV" || pip install -U build twine
 
 	# Build the sdist and wheel that will be uploaded to PyPI.
-	python3 -m build --sdist --wheel || \
-		test -z "$$VIRTUAL_ENV" && \
+	if test -n "$$VIRTUAL_ENV"; then \
+		python -m build --sdist --wheel; \
+	else \
+		python3 -m build --sdist --wheel || \
 		echo "Use a virtual-env with 'python -m venv env && source env/bin/activate' instead" && \
-		false
+		false; \
+	fi
 
 	# Upload to PyPI and push the tag.
 	twine upload dist/*
