From f126cfe73dcf954f647c2af33d5bf68f8babea1b Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 1 Nov 2021 19:52:03 +0000
Subject: Update makefile

---
 makefile | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/makefile b/makefile
index 8220ae6..7f44f0d 100644
--- a/makefile
+++ b/makefile
@@ -1,30 +1,43 @@
-.PHONY: test upload clean bootstrap setup
+.PHONY: test
 
 test:
 	_virtualenv/bin/pyflakes mammoth tests
 	sh -c '. _virtualenv/bin/activate; nosetests tests'
 
+.PHONY: test-all
+
 test-all:
 	tox
 
-upload: setup assert-converted-readme
-	_virtualenv/bin/python setup.py sdist bdist_wheel upload
+.PHONY: upload
+
+upload: setup assert-converted-readme build-dist
+	_virtualenv/bin/twine dist/*
 	make clean
 
-register: setup
-	python setup.py register
+.PHONY: build-dist
+
+build-dist:
+	rm -rf dist
+	_virtualenv/bin/pyproject-build
 
 README: README.md
 	pandoc --from=markdown --to=rst README.md > README || cp README.md README
 
+.PHONY: assert-converted-readme
+
 assert-converted-readme:
 	test "`cat README`" != "`cat README.md`"
 
+.PHONY: clean
+
 clean:
 	rm -f README
 	rm -f MANIFEST
 	rm -rf dist
 
+.PHONY: bootstrap
+
 bootstrap: _virtualenv setup
 	_virtualenv/bin/pip install -e .
 ifneq ($(wildcard test-requirements.txt),)
@@ -32,6 +45,8 @@ ifneq ($(wildcard test-requirements.txt),)
 endif
 	make clean
 
+.PHONY: setup
+
 setup: README
 
 _virtualenv:
@@ -39,3 +54,4 @@ _virtualenv:
 	_virtualenv/bin/pip install --upgrade pip
 	_virtualenv/bin/pip install --upgrade setuptools
 	_virtualenv/bin/pip install --upgrade wheel
+	_virtualenv/bin/pip install --upgrade build twine
-- 
cgit v1.2.3