aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-11-29 03:38:23 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-11-29 03:38:23 +0100
commit45c199a80720f7e615b70919d592be31226e9734 (patch)
tree5b69eba27ce82b59cb5e6bfd537294d2dd8f0dc9
parentdecdb75fbaccbcd041433542f10163c104c43b9c (diff)
downloadmitmproxy-45c199a80720f7e615b70919d592be31226e9734.tar.gz
mitmproxy-45c199a80720f7e615b70919d592be31226e9734.tar.bz2
mitmproxy-45c199a80720f7e615b70919d592be31226e9734.zip
fix tarfile creation
-rw-r--r--rtool.py5
-rwxr-xr-xtest-release38
2 files changed, 2 insertions, 41 deletions
diff --git a/rtool.py b/rtool.py
index c9e697c6..e1259219 100644
--- a/rtool.py
+++ b/rtool.py
@@ -12,7 +12,7 @@ import shlex
import runpy
import pprint
from zipfile import ZipFile
-from tarfile import TarFile
+import tarfile
import platform
import click
@@ -31,8 +31,7 @@ if platform.system() == "Windows":
return a
else:
def Archive(name):
- a = TarFile(name + ".tar.gz", "w:gz")
- return a
+ return tarfile.open(name + ".tar.gz", "w:gz")
RELEASE_DIR = join(os.path.dirname(os.path.realpath(__file__)))
diff --git a/test-release b/test-release
deleted file mode 100755
index 8cbcea8c..00000000
--- a/test-release
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-MITMPROXY_DIR=~/mitmproxy/mitmproxy
-NETLIB_DIR=~/mitmproxy/netlib
-PATHOD_DIR=~/mitmproxy/pathod
-DST=/tmp/mitmproxy_release
-
-rm -rf $DST
-mkdir -p $DST
-
-cd $NETLIB_DIR
-echo "Creating netlib source distribution..."
-python ./setup.py -q sdist --dist-dir $DST
-
-echo "Creating mitmproxy source distribution..."
-cd $MITMPROXY_DIR
-python ./setup.py -q sdist --dist-dir $DST
-
-echo "Creating pathod source distribution..."
-cd $PATHOD_DIR
-python ./setup.py -q sdist --dist-dir $DST
-
-echo "Creating virtualenv for test install..."
-virtualenv -q $DST/venv
-
-cd $DST
-echo "Installing netlib..."
-./venv/bin/pip -q install --download-cache ~/.pipcache ./netlib*
-echo "Installing pathod..."
-./venv/bin/pip -q install --download-cache ~/.pipcache ./pathod*
-echo "Installing mitmproxy..."
-./venv/bin/pip -q install --download-cache ~/.pipcache ./mitmproxy*
-
-echo "Running binaries..."
-./venv/bin/mitmproxy --version
-./venv/bin/mitmdump --version
-./venv/bin/pathod --version
-./venv/bin/pathoc --version