Release bash file?

2 files changed, 18 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 4706a91b..530b8f37 100644
--- a/Makefile
+++ b/Makefile
@@ -38,15 +38,3 @@ test-all: setup requirements
 
 docs: setup requirements
 	cd docs && make html
-
-
-
-VERSION_FILE=urllib3/__init__.py
-
-release: clean
-ifneq ($(shell git rev-parse --abbrev-ref HEAD),makefile)
-	$(error Must be on the release branch before releasing)
-endif
-	@echo "New version (current: $$(grep '__version__' $(VERSION_FILE) | cut -b15-)): "
-	@read version; perl -p -i -e "s/__version__.*/__version__ = '$$version'/" "$(VERSION_FILE)"
-	python setup.py sdist
diff --git a/release.sh b/release.sh
new file mode 100755
index 00000000..8b0d5dab
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Cut a new release based on the latest CHANGES.rst entry.
+# Must be called from the `release` branch.
+
+VERSION_FILE="urllib3/__init__.py"
+CHANGES_FILE="CHANGES.rst"
+
+if [ "$(git rev-parse --abbrev-ref HEAD)" != "release" ]; then
+    echo "Must be called from the release branch."
+    exit 1
+fi
+
+git merge master --no-commit
+git checkout master -- CHANGES.rst
+sed -i '' '4,9d' CHANGES.rst
+
+version="$(grep -m1 -B1 '+++++' "$CHANGES_FILE" | head -n1 | cut -d' ' -f1)"
+perl -p -i -e "s/__version__.*/__version__ = '$(version)'/" "$(VERSION_FILE)"