aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorMarcelo Glezer <mg@tekii.com.ar>2014-12-11 14:54:14 -0300
committerMarcelo Glezer <mg@tekii.com.ar>2014-12-11 14:54:14 -0300
commit4952643a0d76eb1e9bd51cbbe95c565ae48b97a2 (patch)
treef43fc647bdfabb522bdef32e21ea4a36404cc311 /release
parent83b1d4e0e0490e5be05943da459c925a3ee3ff14 (diff)
parentffb95a1db742d71d7671f9e9c6db552774bb0ead (diff)
downloadmitmproxy-4952643a0d76eb1e9bd51cbbe95c565ae48b97a2.tar.gz
mitmproxy-4952643a0d76eb1e9bd51cbbe95c565ae48b97a2.tar.bz2
mitmproxy-4952643a0d76eb1e9bd51cbbe95c565ae48b97a2.zip
Merge remote-tracking branch 'base/master'
Diffstat (limited to 'release')
-rwxr-xr-xrelease/osx-binaries3
-rw-r--r--release/release-checklist21
-rwxr-xr-xrelease/test-release15
3 files changed, 29 insertions, 10 deletions
diff --git a/release/osx-binaries b/release/osx-binaries
index 4be85800..9945e471 100755
--- a/release/osx-binaries
+++ b/release/osx-binaries
@@ -10,7 +10,8 @@
# answer is to touch the __init__.py file in the zope directory. On my system:
# touch /Library/Python/2.7/site-packages/zope/__init__.py
-# To run, change into the pyinstaller directory, and then run this script.
+# To run, first install netlib and mitmproxy, then change into the pyinstaller
+# directory, and then run this script.
DST=/tmp/osx-mitmproxy
MITMPROXY=~/mitmproxy/mitmproxy
diff --git a/release/release-checklist b/release/release-checklist
index d0bf8aad..c0d8d82d 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
@@ -26,3 +24,22 @@
- 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
+
+- Build the sources for each project:
+ python ./setup.py sdist
+ mv ./dist/FILE ~/mitmproxy/www.mitmproxy.org/src/download
+
+
+- Adjust links on www.mitmproxy.org
+
+- Upload to pypi for each project:
+
+ python ./setup.py sdist upload
+
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