From 623055a25a7e819aa09e409e8c61a0220fb3bbb6 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 3 Apr 2020 17:46:34 +0200 Subject: bump dependencies --- setup.py | 10 +++++----- tox.ini | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index d6016746..a5795984 100644 --- a/setup.py +++ b/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"': [ diff --git a/tox.ini b/tox.ini index 729d529a..8513619f 100644 --- a/tox.ini +++ b/tox.ini @@ -40,8 +40,8 @@ commands = passenv = CI_* GITHUB_* AWS_* TWINE_* DOCKER_* deps = -rrequirements.txt - pyinstaller==3.5 - twine==2.0.0 + pyinstaller==3.6 + twine==3.1.1 awscli commands = mitmdump --version -- cgit v1.2.3 From 78cdfa45d7908ff367130c0cd5973b17cf27def4 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 3 Apr 2020 17:49:04 +0200 Subject: fix pyinstaller --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8513619f..73600759 100644 --- a/tox.ini +++ b/tox.ini @@ -40,7 +40,7 @@ commands = passenv = CI_* GITHUB_* AWS_* TWINE_* DOCKER_* deps = -rrequirements.txt - pyinstaller==3.6 + pyinstaller==3.5 twine==3.1.1 awscli commands = -- cgit v1.2.3 From 7c4488e49a68fc25d9764c2b36569ac921e328c1 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 3 Apr 2020 18:01:07 +0200 Subject: update installbuilder --- release/cibuild.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/cibuild.py b/release/cibuild.py index f2fc5470..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,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 ) -- cgit v1.2.3 From b67736bbefbc3d276ce3f873d0c7e76441459c92 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 3 Apr 2020 18:26:38 +0200 Subject: ci: py37 -> py38 --- .github/workflows/main.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fce4dcf3..0010aea1 100644 --- a/.github/workflows/main.yml +++ b/.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 @@ -99,7 +95,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-python@v1 with: - python-version: '3.7' + python-version: '3.8' - if: matrix.os == 'windows-latest' uses: actions/cache@v1 with: @@ -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 @@ -162,7 +158,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-python@v1 with: - python-version: '3.7' + python-version: '3.8' - run: pip install tox - uses: actions/download-artifact@master with: @@ -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: -- cgit v1.2.3 From 35cb5ff4506a0131721b498eee59bc8680386d70 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 3 Apr 2020 18:38:01 +0200 Subject: downgrade to py37 for pyinstaller builds --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0010aea1..59dad0ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,7 +95,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-python@v1 with: - python-version: '3.8' + python-version: '3.7' - if: matrix.os == 'windows-latest' uses: actions/cache@v1 with: @@ -158,7 +158,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-python@v1 with: - python-version: '3.8' + python-version: '3.7' - run: pip install tox - uses: actions/download-artifact@master with: -- cgit v1.2.3