diff --git a/release/hooks/hook-cryptography.py b/release/hooks/hook-cryptography.py deleted file mode 100644 index 5ecbd6ccf..000000000 --- a/release/hooks/hook-cryptography.py +++ /dev/null @@ -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')) diff --git a/release/hooks/hook-passlib.py b/release/hooks/hook-passlib.py index 4f1efbb83..62f5ba5b9 100644 --- a/release/hooks/hook-passlib.py +++ b/release/hooks/hook-passlib.py @@ -1 +1,3 @@ +# https://github.com/pyinstaller/pyinstaller-hooks-contrib/pull/39 + hiddenimports = ["configparser"] diff --git a/release/hooks/hook-pkg_resources.py b/release/hooks/hook-pkg_resources.py deleted file mode 100644 index 8bd787f2f..000000000 --- a/release/hooks/hook-pkg_resources.py +++ /dev/null @@ -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__'] diff --git a/tox.ini b/tox.ini index 47582a54d..f8987c69a 100644 --- a/tox.ini +++ b/tox.ini @@ -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 =