From 3b98db52ca9137cbeca99059fe43744ebf8125c1 Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas.motl@panodata.org>
Date: Wed, 3 Aug 2022 12:50:07 +0200
Subject: [PATCH] Improve project tooling re. "releasing"

---
 Makefile               | 13 ++++++-------
 requirements-utils.txt |  5 +++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1bf01dd..6b5ea12 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ $(eval proselint    := $(venvpath)/bin/proselint)
 # Setup Python virtualenv
 setup-virtualenv:
 	@test -e $(python) || python3 -m venv $(venvpath)
+	$(pip) install --requirement=requirements-utils.txt
 
 
 # -------
@@ -55,7 +56,7 @@ test-coverage: install-tests
 # Release this piece of software
 # Synopsis:
 #   make release bump=minor  (major,minor,patch)
-release: bumpversion push sdist pypi-upload
+release: bumpversion push build upload
 
 
 # -------------
@@ -77,11 +78,11 @@ bumpversion: install-releasetools
 push:
 	git push && git push --tags
 
-sdist:
-	@$(python) setup.py sdist
+build:
+	@$(python) -m build
 
-pypi-upload: install-releasetools
-	twine upload --skip-existing --verbose dist/*.tar.gz
+upload:
+	$(twine) upload --skip-existing dist/*{.tar.gz,.whl}
 
 install-doctools: setup-virtualenv
 	@$(pip) install --quiet --requirement requirements-docs.txt --upgrade
@@ -100,12 +101,10 @@ install-tests: setup-virtualenv
 # ----------------------
 
 format: setup-virtualenv
-	$(pip) install --requirement=requirements-utils.txt
 	$(black) .
 	$(isort) .
 
 lint: setup-virtualenv
-	$(pip) install --requirement=requirements-utils.txt
 	$(flake8) --exit-zero luftdatenpumpe tests
 	$(proselint) *.rst doc/**/*.rst || true
 
diff --git a/requirements-utils.txt b/requirements-utils.txt
index 15f02a6..fcc9c94 100644
--- a/requirements-utils.txt
+++ b/requirements-utils.txt
@@ -1,5 +1,10 @@
+# Sandbox
 black
 isort
 pyproject-flake8
 flake8<5
 proselint
+
+# Release
+build
+wheel