Merge remote-tracking branch 'origin/master' into fix-ci

4 files changed, 13 insertions, 5 deletions

diff --git a/release/README.md b/release/README.md
index 1b8614ea..8632d644 100644
--- a/release/README.md
+++ b/release/README.md
@@ -3,6 +3,7 @@
 These steps assume you are on the correct branch and have a git remote called `origin` that points to the `mitmproxy/mitmproxy` repo. If necessary, create a major version branch starting off the release tag (e.g. `git checkout -b v4.x v4.0.0`) first.
 
 - Update CHANGELOG.
+- Verify that the compiled mitmweb assets are up-to-date.
 - Verify that all CI tests pass.
 - Verify that `mitmproxy/version.py` is correct. Remove `.dev` suffix if it exists.
 - Tag the release and push to Github.
diff --git a/release/cibuild.py b/release/cibuild.py
index b2bad9a0..d070a4b9 100755
--- a/release/cibuild.py
+++ b/release/cibuild.py
@@ -454,10 +454,10 @@ def build_wininstaller(be: BuildEnviron):  # pragma: no cover
         return
     click.echo("Building wininstaller package...")
 
-    IB_VERSION = "19.10.0"
+    IB_VERSION = "20.3.0"
     IB_DIR = pathlib.Path(be.release_dir) / "installbuilder"
     IB_SETUP = IB_DIR / "setup" / f"{IB_VERSION}-installer.exe"
-    IB_CLI = fr"C:\Program Files (x86)\BitRock InstallBuilder Enterprise {IB_VERSION}\bin\builder-cli.exe"
+    IB_CLI = fr"C:\Program Files (x86)\VMware InstallBuilder Enterprise {IB_VERSION}\bin\builder-cli.exe"
     IB_LICENSE = IB_DIR / "license.xml"
 
     if not os.path.isfile(IB_CLI):
@@ -470,11 +470,11 @@ def build_wininstaller(be: BuildEnviron):  # pragma: no cover
                     click.secho(f"Downloading... {round(100 * done / total)}%")
 
             urllib.request.urlretrieve(
-                f"https://clients.bitrock.com/installbuilder/installbuilder-enterprise-{IB_VERSION}-windows-installer.exe",
+                f"https://installbuilder.com/installbuilder-enterprise-{IB_VERSION}-windows-installer.exe",
                 IB_SETUP.with_suffix(".tmp"),
                 reporthook=report
             )
-            shutil.move(IB_SETUP.with_suffix(".tmp"), IB_SETUP)
+            shutil.move(str(IB_SETUP.with_suffix(".tmp")), str(IB_SETUP))
 
         click.echo("Install InstallBuilder...")
         subprocess.run([str(IB_SETUP), "--mode", "unattended", "--unattendedmodeui", "none"], check=True)
diff --git a/release/docker/README.md b/release/docker/README.md
index b676d3ae..2fa93949 100644
--- a/release/docker/README.md
+++ b/release/docker/README.md
@@ -23,7 +23,7 @@ $ docker run --rm -it -p 8080:8080 mitmproxy/mitmproxy mitmdump
 For `mitmweb`, you also need to expose port 8081:
 ```sh
 # this makes :8081 accessible to the local machine only
-$ docker run --rm -it -p 8080:8080 -p 127.0.0.1:8081:8081 mitmproxy/mitmproxy mitmweb --web-iface 0.0.0.0
+$ docker run --rm -it -p 8080:8080 -p 127.0.0.1:8081:8081 mitmproxy/mitmproxy mitmweb --web-host 0.0.0.0
 ```
 
 You can also pass options directly via the CLI:
diff --git a/release/hooks/hook-pkg_resources.py b/release/hooks/hook-pkg_resources.py
new file mode 100644
index 00000000..8bd787f2
--- /dev/null
+++ b/release/hooks/hook-pkg_resources.py
@@ -0,0 +1,7 @@
+# flake8: noqa
+
+# temporary fix for https://github.com/pypa/setuptools/issues/1963
+# can be removed when we upgrade to PyInstaller 3.7.
+hiddenimports = collect_submodules('pkg_resources._vendor')
+hiddenimports.append('pkg_resources.py2_warn')
+excludedimports = ['__main__']