diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /release | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'release')
| -rw-r--r-- | release/mitmdump.spec | 4 | ||||
| -rw-r--r-- | release/mitmproxy.spec | 4 | ||||
| -rw-r--r-- | release/mitmweb.spec | 4 | ||||
| -rw-r--r-- | release/release-checklist | 7 |
4 files changed, 17 insertions, 2 deletions
diff --git a/release/mitmdump.spec b/release/mitmdump.spec index 1707122c..f9b0311c 100644 --- a/release/mitmdump.spec +++ b/release/mitmdump.spec @@ -16,6 +16,10 @@ a.datas += Tree( "./libmproxy/onboarding/static", prefix="libmproxy/onboarding/static" ) +a.datas += Tree( + "../venv.mitmproxy/lib/python2.7/site-packages/cryptography/hazmat/bindings/openssl/src", + prefix = "cryptography/hazmat/bindings/openssl/src" +) pyz = PYZ(a.pure) exe = EXE(pyz, a.scripts, diff --git a/release/mitmproxy.spec b/release/mitmproxy.spec index cc324aa7..9aab5ef4 100644 --- a/release/mitmproxy.spec +++ b/release/mitmproxy.spec @@ -16,6 +16,10 @@ a.datas += Tree( "./libmproxy/onboarding/static", prefix="libmproxy/onboarding/static" ) +a.datas += Tree( + "../venv.mitmproxy/lib/python2.7/site-packages/cryptography/hazmat/bindings/openssl/src", + prefix = "cryptography/hazmat/bindings/openssl/src" +) pyz = PYZ(a.pure) exe = EXE(pyz, a.scripts, diff --git a/release/mitmweb.spec b/release/mitmweb.spec index b247ce51..565482e6 100644 --- a/release/mitmweb.spec +++ b/release/mitmweb.spec @@ -24,6 +24,10 @@ a.datas += Tree( "./libmproxy/web/static", prefix="libmproxy/web/static" ) +a.datas += Tree( + "../venv.mitmproxy/lib/python2.7/site-packages/cryptography/hazmat/bindings/openssl/src", + prefix = "cryptography/hazmat/bindings/openssl/src" +) pyz = PYZ(a.pure) exe = EXE(pyz, a.scripts, diff --git a/release/release-checklist b/release/release-checklist index 154103e9..84a7152e 100644 --- a/release/release-checklist +++ b/release/release-checklist @@ -5,6 +5,9 @@ netlib/netlib/version.py pathod/libpathod/version.py +- Ensure that the website style assets have been compiled for production, and +synced to the docs. + - Render the docs: cshape doc-src doc @@ -20,14 +23,14 @@ python ./setup.py sdist mv ./dist/FILE ~/mitmproxy/www.mitmproxy.org/src/download -- Tag with the version number, and do: +- Tag with the version number, and do: git push --tags - Upload to pypi for each project: python ./setup.py sdist upload -- Now bump the version number to be ready for the next cycle: +- Now bump the version number to be ready for the next cycle: mitmproxy/libmproxy/version.py netlib/netlib/version.py |