From 5621cf325d2e3b8ee3141a5aa5ef2d47d7dafae5 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 17 Oct 2015 09:02:32 +0000
Subject: [PATCH 1/6] dev-release.sh: Update setuptools/pip

---
 tools/dev-release.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/dev-release.sh b/tools/dev-release.sh
index cebe5001c..6a981b4c6 100755
--- a/tools/dev-release.sh
+++ b/tools/dev-release.sh
@@ -74,9 +74,10 @@ python -m SimpleHTTPServer $PORT &
 # installed from local PyPI rather than current directory (repo root)
 virtualenv --no-site-packages ../venv
 . ../venv/bin/activate
-# Now, use our local PyPI. --pre allows installation of pre-release (incl. dev)
+pip install -U setuptools
+pip install -U pip
+# Now, use our local PyPI
 pip install \
-  --pre \
   --extra-index-url http://localhost:$PORT \
   letsencrypt $SUBPKGS
 # stop local PyPI

From da631557241f09acc3fa209e3be3342073323c2f Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 17 Oct 2015 09:09:57 +0000
Subject: [PATCH 2/6] dev release: clean up subpkgs/subpkg_modules confusion

---
 tools/dev-release.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/dev-release.sh b/tools/dev-release.sh
index 6a981b4c6..655f66235 100755
--- a/tools/dev-release.sh
+++ b/tools/dev-release.sh
@@ -10,8 +10,8 @@ RELEASE_GPG_KEY="${RELEASE_GPG_KEY:-148C30F6F7E429337A72D992B00B9CC82D7ADF2C}"
 PORT=${PORT:-1234}
 
 # subpackages to be released
-SUBPKGS=${SUBPKGS:-"acme letsencrypt_apache letsencrypt_nginx letshelp_letsencrypt"}
-subpkgs_dirs="$(echo $SUBPKGS | sed s/_/-/g)"
+SUBPKGS=${SUBPKGS:-"acme letsencrypt-apache letsencrypt-nginx letshelp-letsencrypt"}
+subpkgs_modules="$(echo $SUBPKGS | sed s/-/_/g)"
 # letsencrypt_compatibility_test is not packaged because:
 # - it is not meant to be used by anyone else than Let's Encrypt devs
 # - it causes problems when running nosetests - the latter tries to
@@ -29,7 +29,7 @@ cd $root
 git branch -f "$DEV_RELEASE_BRANCH"
 git checkout "$DEV_RELEASE_BRANCH"
 
-for pkg_dir in $subpkgs_dirs
+for pkg_dir in $SUBPKGS
 do
   sed -i $x "s/^version.*/version = '$version'/" $pkg_dir/setup.py
 done
@@ -41,7 +41,7 @@ git tag --local-user "$RELEASE_GPG_KEY" \
     --sign --message "Release $version" "$tag"
 
 echo "Preparing sdists and wheels"
-for pkg_dir in . $subpkgs_dirs
+for pkg_dir in . $SUBPKGS
 do
   cd $pkg_dir
 
@@ -61,7 +61,7 @@ done
 
 mkdir "dist.$version"
 mv dist "dist.$version/letsencrypt"
-for pkg_dir in $subpkgs_dirs
+for pkg_dir in $SUBPKGS
 do
   mv $pkg_dir/dist "dist.$version/$pkg_dir/"
 done
@@ -89,7 +89,7 @@ mkdir ../kgs
 kgs="../kgs/$version"
 pip freeze | tee $kgs
 pip install nose
-nosetests letsencrypt $SUBPKGS
+nosetests letsencrypt $subpkgs_modules
 
 echo "New root: $root"
 echo "KGS is at $root/kgs"

From 31109b3332ed6314b2ea0e17956837c1d32421a8 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 17 Oct 2015 10:55:41 +0000
Subject: [PATCH 3/6] log git commit in dev release

---
 tools/dev-release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/dev-release.sh b/tools/dev-release.sh
index 655f66235..682594f81 100755
--- a/tools/dev-release.sh
+++ b/tools/dev-release.sh
@@ -25,6 +25,7 @@ git tag --delete "$tag" || true
 root="$(mktemp -d -t le.$version.XXX)"
 echo "Cloning into fresh copy at $root"  # clean repo = no artificats
 git clone . $root
+git rev-parse HEAD
 cd $root
 git branch -f "$DEV_RELEASE_BRANCH"
 git checkout "$DEV_RELEASE_BRANCH"

From 0cf2b5a4bd5f0b469522baa946e6be3346b1d29e Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 17 Oct 2015 10:57:02 +0000
Subject: [PATCH 4/6] dev release: start with fresh virtualenv

---
 tools/dev-release.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/dev-release.sh b/tools/dev-release.sh
index 682594f81..3d6f97202 100755
--- a/tools/dev-release.sh
+++ b/tools/dev-release.sh
@@ -22,6 +22,15 @@ tag="v$version"
 mv "dist.$version" "dist.$version.$(date +%s).bak" || true
 git tag --delete "$tag" || true
 
+tmpvenv=$(mktemp -d)
+virtualenv --no-site-packages $tmpvenv
+. $tmpvenv/bin/activate
+pip install -U setuptools
+pip install -U pip
+pip install -U wheel
+# updating virtualenv does some crazy stuff...
+pip install -U virtualenv
+
 root="$(mktemp -d -t le.$version.XXX)"
 echo "Cloning into fresh copy at $root"  # clean repo = no artificats
 git clone . $root

From 9ebf530dc4f5882dc298fe3090d90fb894692ae7 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 17 Oct 2015 11:12:46 +0000
Subject: [PATCH 5/6] dev-release: more comments about recent changes

---
 tools/dev-release.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/dev-release.sh b/tools/dev-release.sh
index 3d6f97202..57f1b8a8e 100755
--- a/tools/dev-release.sh
+++ b/tools/dev-release.sh
@@ -25,10 +25,12 @@ git tag --delete "$tag" || true
 tmpvenv=$(mktemp -d)
 virtualenv --no-site-packages $tmpvenv
 . $tmpvenv/bin/activate
+# update setuptools/pip just like in other places in the repo
 pip install -U setuptools
-pip install -U pip
-pip install -U wheel
-# updating virtualenv does some crazy stuff...
+pip install -U pip  # latest pip => no --pre for dev releases
+pip install -U wheel  # setup.py bdist_wheel newer versions of
+# virtualenv inherit setuptools/pip/wheel versions from current env
+# when creating a child env
 pip install -U virtualenv
 
 root="$(mktemp -d -t le.$version.XXX)"

From 17a09eac6b5e38c1d49a14ba9bec892295a42018 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 17 Oct 2015 11:13:43 +0000
Subject: [PATCH 6/6] fix comment

---
 tools/dev-release.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/dev-release.sh b/tools/dev-release.sh
index 57f1b8a8e..6bbc6ced4 100755
--- a/tools/dev-release.sh
+++ b/tools/dev-release.sh
@@ -28,9 +28,10 @@ virtualenv --no-site-packages $tmpvenv
 # update setuptools/pip just like in other places in the repo
 pip install -U setuptools
 pip install -U pip  # latest pip => no --pre for dev releases
-pip install -U wheel  # setup.py bdist_wheel newer versions of
-# virtualenv inherit setuptools/pip/wheel versions from current env
-# when creating a child env
+pip install -U wheel  # setup.py bdist_wheel
+
+# newer versions of virtualenv inherit setuptools/pip/wheel versions
+# from current env when creating a child env
 pip install -U virtualenv
 
 root="$(mktemp -d -t le.$version.XXX)"