Merge branch 'master' of github.com:mitmproxy/mitmproxy

4 files changed, 11 insertions, 19 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c78fdcce..2df1c839 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 
 23 October 2014: mitmproxy 0.11:
+    
+    * Performance improvements for mitmproxy console
 
     * SOCKS5 proxy mode allows mitmproxy to act as a SOCKS5 proxy server
 
diff --git a/release/release-checklist b/release/release-checklist
index 683e9b89..4ec74e7a 100644
--- a/release/release-checklist
+++ b/release/release-checklist
@@ -2,8 +2,6 @@
 - Bump the version number: 
 
     mitmproxy/libmproxy/version.py
-    mitmproxy/requirements.txt
-    mitmproxy/test/requirements.txt
     netlib/netlib/version.py
     netlib/requirements.txt
     netlib/test/requirements.txt
diff --git a/release/test-release b/release/test-release
index 8b53c14c..8cbcea8c 100755
--- a/release/test-release
+++ b/release/test-release
@@ -23,15 +23,16 @@ python ./setup.py -q sdist --dist-dir $DST
 echo "Creating virtualenv for test install..."
 virtualenv -q $DST/venv
 
+cd $DST
 echo "Installing netlib..."
-$DST/venv/bin/pip -q install --download-cache ~/.pipcache $DST/netlib*
+./venv/bin/pip -q install --download-cache ~/.pipcache ./netlib*
 echo "Installing pathod..."
-$DST/venv/bin/pip -q install --download-cache ~/.pipcache $DST/pathod*
+./venv/bin/pip -q install --download-cache ~/.pipcache ./pathod*
 echo "Installing mitmproxy..."
-$DST/venv/bin/pip -q install --download-cache ~/.pipcache $DST/mitmproxy*
+./venv/bin/pip -q install --download-cache ~/.pipcache ./mitmproxy*
 
 echo "Running binaries..."
-$DST/venv/bin/mitmproxy --version
-$DST/venv/bin/mitmdump --version
-$DST/venv/bin/pathod --version
-$DST/venv/bin/pathoc --version
+./venv/bin/mitmproxy --version
+./venv/bin/mitmdump --version
+./venv/bin/pathod --version
+./venv/bin/pathoc --version
diff --git a/setup.py b/setup.py
index 149e544a..08ccbbfd 100644
--- a/setup.py
+++ b/setup.py
@@ -36,10 +36,6 @@ for script in scripts:
 if os.name == "nt":
     deps.add("pydivert>=0.0.4")  # Transparent proxying on Windows
 
-console_scripts = [
-    "%s = libmproxy.main:%s" % (s, s) for s in scripts
-]
-
 
 setup(
     name="mitmproxy",
@@ -66,14 +62,9 @@ setup(
         "Topic :: Internet :: Proxy Servers",
         "Topic :: Software Development :: Testing"
     ],
-
     packages=find_packages(),
     include_package_data=True,
-
-    entry_points={
-        'console_scripts': console_scripts
-    },
-
+    scripts = scripts,
     install_requires=list(deps),
     extras_require={
         'dev': [