Merge pull request #3892 from mhils/update-dependencies

Update Dependencies

.github/workflows/main.yml

@@ -2,10 +2,6 @@ name: CI
 
 on: [push, pull_request]
 
-# We currently use Python 3.7 for most things:
-# - zstandard currently doesn't have 3.8 wheels,
-# - we need to upgrade cryptography from version 2.4, which also doesn't have wheels
-
 env:
   # Codecov
   CODECOV_TOKEN: "0409bdfd-57a4-477d-a8af-f6172ef431d3"
@@ -44,9 +40,9 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.8'
       - run: pip install tox
-      - run: tox -e py37
+      - run: tox -e py38
       # codecov's GitHub action only supports Linux. https://github.com/codecov/codecov-action/issues/7
       # codecov's Python uploader has no github actions support yet. https://github.com/codecov/codecov-python/pull/214
       - name: Extract branch name  # https://stackoverflow.com/a/58035262/934719
@@ -77,7 +73,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.8'
       - run: pip install tox
       - run: tox -e cibuild -- build
       - uses: actions/upload-artifact@master
@@ -142,7 +138,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.8'
       - run: pip install tox
       - run: |
           wget https://github.com/gohugoio/hugo/releases/download/v0.65.3/hugo_extended_0.65.3_Linux-64bit.deb
@@ -187,7 +183,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.8'
       # artifacts must be downloaded individually, see https://github.com/actions/download-artifact/issues/6
       - uses: actions/download-artifact@master
         with:

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,7 +470,7 @@ 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
             )

setup.py

@@ -71,20 +71,20 @@ setup(
         "h2>=3.2.0,<4",
         "hyperframe>=5.1.0,<6",
         "kaitaistruct>=0.7,<0.9",
-        "ldap3>=2.6.1,<2.7",
+        "ldap3>=2.6.1,<2.8",
         "passlib>=1.6.5, <1.8",
-        "protobuf>=3.6.0, <3.11",
+        "protobuf>=3.6.0, <3.12",
         "pyasn1>=0.3.1,<0.5",
         "pyOpenSSL>=19.1.0,<19.2",
         "pyparsing>=2.4.2,<2.5",
-        "pyperclip>=1.6.0,<1.8",
+        "pyperclip>=1.6.0,<1.9",
         "ruamel.yaml>=0.16,<0.17",
         "sortedcontainers>=2.1.0,<2.2",
         "tornado>=4.3,<7",
         "urwid>=2.1.0,<2.2",
-        "wsproto>=0.14.0,<0.15.0",
+        "wsproto>=0.14,<0.16",
         "publicsuffix2>=2.20190812,<3",
-        "zstandard>=0.11.0,<0.13.0",
+        "zstandard>=0.11,<0.14",
     ],
     extras_require={
         ':sys_platform == "win32"': [

tox.ini

@@ -41,7 +41,7 @@ passenv = CI_* GITHUB_* AWS_* TWINE_* DOCKER_*
 deps =
   -rrequirements.txt
   pyinstaller==3.5
-  twine==2.0.0
+  twine==3.1.1
   awscli
 commands =
   mitmdump --version