From 7f036e4750db4dced46a1535e387388d0b549e21 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 26 Jul 2017 22:36:07 +0100 Subject: [PATCH] Tweak release structure in Makefile Allow changelog to be updated without doing anything else so dist builds can be tried before actual release/upload --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 000256b..0923e83 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ $(DIST_DSC): $(PY_SOURCES) $(SUBDIRS) $(DEB_SOURCES) $(MAN_PAGES) mkdir -p dist/ for f in $(DIST_DSC); do cp ../$${f##*/} dist/; done -release: $(PY_SOURCES) $(DOC_SOURCES) $(DEB_SOURCES) +changelog: $(PY_SOURCES) $(DOC_SOURCES) $(DEB_SOURCES) $(MAKE) clean # ensure there are no current uncommitted changes test -z "$(shell git status --porcelain)" @@ -160,17 +160,17 @@ release: $(PY_SOURCES) $(DOC_SOURCES) $(DEB_SOURCES) dch --newversion $(VER)$(DEB_SUFFIX) --controlmaint # commit the changes and add a new tag git commit debian/changelog -m "Updated changelog for release $(VER)" + +release: $(PY_SOURCES) $(DOC_SOURCES) $(DIST_DEB) $(DIST_DSC) git tag -s v$(VER) -m "Release v$(VER)" + git push --tags # update the package's registration on PyPI (in case any metadata's changed) $(PYTHON) $(PYFLAGS) setup.py register -r https://pypi.python.org/pypi - -upload: $(PY_SOURCES) $(DOC_SOURCES) $(DIST_DEB) $(DIST_DSC) # build a source archive and upload to PyPI $(PYTHON) $(PYFLAGS) setup.py sdist upload -r https://pypi.python.org/pypi # build the deb source archive and upload to Raspbian dput raspberrypi dist/$(NAME)_$(VER)$(DEB_SUFFIX)_source.changes dput raspberrypi dist/$(NAME)_$(VER)$(DEB_SUFFIX)_$(DEB_ARCH).changes - git push --tags .PHONY: all install develop test doc source egg zip tar deb dist clean tags release upload $(SUBDIRS)