From 84f57a283287e7358eed7f8e36fbe0a0652a8675 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 28 Dec 2014 23:16:50 +1300
Subject: Adjust how doc rendering uses mitmproxy source location

We now make sure our imports come from here too, and that we have mod cons like
tilde expansion in the env variable.
---
 doc-src/config.html       |  6 ------
 doc-src/index.py          |  7 +++++--
 release/release-checklist | 20 +++++++++-----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/doc-src/config.html b/doc-src/config.html
index 60404449..46688575 100644
--- a/doc-src/config.html
+++ b/doc-src/config.html
@@ -84,9 +84,3 @@ palette = light
 </pre>
 
 
-
-
-
-
-
-
diff --git a/doc-src/index.py b/doc-src/index.py
index f3d3ed3b..753f90a5 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -4,10 +4,13 @@ import datetime
 import countershape
 from countershape import Page, Directory, markup, model
 import countershape.template
-sys.path.insert(0, "..")
+
+MITMPROXY_SRC = os.path.abspath(
+    os.path.expanduser(os.environ.get("MITMPROXY_SRC", ".."))
+)
+sys.path.insert(0, MITMPROXY_SRC)
 from libmproxy import filt, version
 
-MITMPROXY_SRC = os.environ.get("MITMPROXY_SRC", os.path.abspath(".."))
 ns.VERSION = version.VERSION
 
 if ns.options.website:
diff --git a/release/release-checklist b/release/release-checklist
index f3abaf6a..0dd99b13 100644
--- a/release/release-checklist
+++ b/release/release-checklist
@@ -1,5 +1,5 @@
 
-- Bump the version number: 
+- Check the version number:
 
     mitmproxy/libmproxy/version.py
     netlib/netlib/version.py
@@ -14,18 +14,10 @@
 - Build sdist packages:
     python ./setup.py sdist
 
-- Test the packages by installing in a virtualenv:
-    - cd dist
-    - tar -xzvf pkgfile.tgz
-    - virtualenv venv
-
 - Build the OSX binaries
     - Follow instructions in osxbinaries
-    - Package:
-        cp -r ./doc /tmp/osx-mitmproxy/
-        mv /tmp/osx-mitmproxy /tmp/osx-mitmproxy-VERSION
-        tar -czvf /tmp/osx-mitmproxy-VERSION.tar.gz /tmp/osx-mitmproxy-VERSION
-        mv /tmp/osx-mitmproxy-VERSION.tar.gz ~/mitmproxy/www.mitmproxy.org/src/download
+    - Move to download dir:
+        mv ./tmp/osx-mitmproxy-VERSION.tar.gz ~/mitmproxy/www.mitmproxy.org/src/download
 
 - Build the sources for each project:
     python ./setup.py sdist
@@ -37,3 +29,9 @@
 
     python ./setup.py sdist upload
 
+- Now bump the version number to be ready for the next cycle: 
+
+    mitmproxy/libmproxy/version.py
+    netlib/netlib/version.py
+    pathod/libpathod/version.py
+
-- 
cgit v1.2.3