Merge pull request #4176 from mhils/pyinstaller

Update PyInstaller

release/hooks/hook-cryptography.py

@@ -1,44 +0,0 @@
-# Taken from the latest pyinstaller master on 2016-11-27 (0729a2b).
-# flake8: noqa
-
-#-----------------------------------------------------------------------------
-# Copyright (c) 2005-2016, PyInstaller Development Team.
-#
-# Distributed under the terms of the GNU General Public License with exception
-# for distributing bootloader.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
-
-"""
-Hook for cryptography module from the Python Cryptography Authority.
-"""
-
-import os.path
-import glob
-
-from PyInstaller.compat import EXTENSION_SUFFIXES
-from PyInstaller.utils.hooks import collect_submodules, get_module_file_attribute
-from PyInstaller.utils.hooks import copy_metadata
-
-# get the package data so we can load the backends
-datas = copy_metadata('cryptography')
-
-# Add the backends as hidden imports
-hiddenimports = collect_submodules('cryptography.hazmat.backends')
-
-# Add the OpenSSL FFI binding modules as hidden imports
-hiddenimports += collect_submodules('cryptography.hazmat.bindings.openssl') + ['_cffi_backend']
-
-
-# Include the cffi extensions as binaries in a subfolder named like the package.
-# The cffi verifier expects to find them inside the package directory for
-# the main module. We cannot use hiddenimports because that would add the modules
-# outside the package.
-binaries = []
-cryptography_dir = os.path.dirname(get_module_file_attribute('cryptography'))
-for ext in EXTENSION_SUFFIXES:
-    ffimods = glob.glob(os.path.join(cryptography_dir, '*_cffi_*%s*' % ext))
-    for f in ffimods:
-        binaries.append((f, 'cryptography'))

release/hooks/hook-passlib.py

@@ -1 +1,3 @@
+# https://github.com/pyinstaller/pyinstaller-hooks-contrib/pull/39
+
 hiddenimports = ["configparser"]

release/hooks/hook-pkg_resources.py

@@ -1,7 +0,0 @@
-# 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__']

setup.py

@@ -66,7 +66,7 @@ setup(
         "Brotli>=1.0,<1.1",
         "certifi>=2019.9.11",  # no semver here - this should always be on the last release!
         "click>=7.0,<8",
-        "cryptography>=3.0,<3.1",
+        "cryptography>=3.0,<3.2",
         "flask>=1.1.1,<1.2",
         "h2>=3.2.0,<4",
         "hyperframe>=5.1.0,<6",
@@ -99,7 +99,7 @@ setup(
             "Flask>=1.0,<1.2",
             "hypothesis>=5.8,<5.30",
             "parver>=0.1,<2.0",
-            "pytest-asyncio>=0.10.0,<0.14",
+            "pytest-asyncio>=0.10.0,<0.14,!=0.14",
             "pytest-cov>=2.7.1,<3",
             "pytest-timeout>=1.3.3,<2",
             "pytest-xdist>=1.29,<2.2",

tox.ini

@@ -23,7 +23,7 @@ commands =
   bash -c "mitmdump --version 2>&1 | grep 'mitmproxy requires Python 3.6'"
 
 [testenv:flake8]
-deps = flake8==3.8
+deps = flake8==3.8.3
 commands =
   flake8 --jobs 8 mitmproxy pathod examples test release
 
@@ -51,7 +51,7 @@ commands =
 passenv = CI_* GITHUB_* AWS_* TWINE_* DOCKER_*
 deps =
   -rrequirements.txt
-  pyinstaller==3.5
+  pyinstaller==4.0
   twine==3.2.0
   awscli
 commands =