Use release.mk from https://github.com/mgedmin/python-project-skel

Author: mgedmin

Makefile

@@ -2,11 +2,8 @@ PYTHON = python
 
 FILE_WITH_VERSION = objgraph.py
 FILE_WITH_CHANGELOG = CHANGES.rst
-VCS_STATUS = git status --porcelain
-VCS_EXPORT = git archive --format=tar --prefix=tmp/tree/ HEAD | tar -xf -
+
 VCS_DIFF_IMAGES = git diff docs/*.png
-VCS_TAG = git tag
-VCS_COMMIT_AND_PUSH = git commit -av -m "Post-release version bump" && git push && git push --tags
 
 SUPPORTED_PYTHON_VERSIONS = 2.7 3.3 3.4 3.5 3.6
 
@@ -54,7 +51,7 @@ test-all-pythons:
 .PHONY: preview-pypi-description
 preview-pypi-description:
 	# pip install restview, if missing
-	restview -e "$(PYTHON) setup.py --long-description"
+	restview --long-description
 
 .PHONY: coverage
 coverage:
@@ -67,47 +64,6 @@ lint:
 	flake8 --exclude=build,docs/conf.py --ignore=E226
 	flake8 --exclude=build,docs/conf.py --doctests --ignore=E226,F821
 
-.PHONY: dist
-dist:
-	$(PYTHON) setup.py -q sdist
-
-.PHONY: distcheck
-distcheck:
-	# Bit of a chicken-and-egg here, but if the tree is unclean, make
-	# distcheck will fail.
-	@test -z "`$(VCS_STATUS) 2>&1`" || { echo; echo "Your working tree is not clean" 1>&2; $(VCS_STATUS); exit 1; }
-	make dist
-	pkg_and_version=`$(PYTHON) setup.py --name`-`$(PYTHON) setup.py --version` && \
-	rm -rf tmp && \
-	mkdir tmp && \
-	$(VCS_EXPORT) && \
-	cd tmp && \
-	tar xvzf ../dist/$$pkg_and_version.tar.gz && \
-	diff -ur $$pkg_and_version tree -x PKG-INFO -x setup.cfg -x '*.egg-info' && \
-	cd $$pkg_and_version && \
-	make dist check && \
-	cd .. && \
-	mkdir one two && \
-	cd one && \
-	tar xvzf ../../dist/$$pkg_and_version.tar.gz && \
-	cd ../two/ && \
-	tar xvzf ../$$pkg_and_version/dist/$$pkg_and_version.tar.gz && \
-	cd .. && \
-	diff -ur one two -x SOURCES.txt && \
-	cd .. && \
-	rm -rf tmp && \
-	echo "sdist seems to be ok"
-
-.PHONY: releasechecklist
-releasechecklist:
-	@$(PYTHON) setup.py --version | grep -qv dev || { \
-	    echo "Please remove the 'dev' suffix from the version number in $(FILE_WITH_VERSION)"; exit 1; }
-	@$(PYTHON) setup.py --long-description | rst2html --exit-status=2 > /dev/null
-	@ver_and_date="`$(PYTHON) setup.py --version` (`date +%Y-%m-%d`)" && \
-	    grep -q "^$$ver_and_date$$" $(FILE_WITH_CHANGELOG) || { \
-	        echo "$(FILE_WITH_CHANGELOG) has no entry for $$ver_and_date"; exit 1; }
-	make distcheck
-
 # Make sure $(VCS_DIFF_IMAGES) can work
 .PHONY: config-imgdiff
 config-imgdiff:
@@ -117,8 +73,12 @@ config-imgdiff:
 imgdiff: config-imgdiff
 	$(VCS_DIFF_IMAGES)
 
-.PHONY: release
-release: releasechecklist config-imgdiff
+include release.mk
+
+.PHONY: do-release
+do-release: config-imgdiff
+
+define release_recipe =
 	# I'm chicken so I won't actually do these things yet
 	@echo "It is a good idea to run"
 	@echo
@@ -131,14 +91,15 @@ release: releasechecklist config-imgdiff
 	@echo
 	@echo "then either revert or commit the new images and run"
 	@echo
-	@echo "  rm -rf dist && $(PYTHON) setup.py sdist bdist_wheel && twine upload dist/* && $(VCS_TAG) `$(PYTHON) setup.py --version`"
+	@echo "  $(PYPI_PUBLISH)"
 	@echo "  make publish-docs"
 	@echo
 	@echo "Please increment the version number in $(FILE_WITH_VERSION)"
 	@echo "and add a new empty entry at the top of the changelog in $(FILE_WITH_CHANGELOG), then"
 	@echo
 	@echo '  $(VCS_COMMIT_AND_PUSH)'
 	@echo
+endef
 
 .PHONY: publish-docs
 publish-docs: