require branch merge to happen before pypi

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
12 years ago · 3b9b0dde56
parent 2286acc6f2
commit 3b9b0dde56
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -211,7 +211,7 @@ git-release: git-tag
 #
 PYPI_FILE=.lock-pypi

-pypi-release: $(PYPI_FILE)
+pypi-release: $(PYPI_FILE) git-branch-merge

 $(PYPI_FILE): man $(VERSION_FILE)
 	python3 setup.py sdist upload