diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /release | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
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 | 3 |
4 files changed, 15 insertions, 0 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..873c5fcf 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 |