diff --git a/PyInstaller/hooks/hook-eth_abi.py b/PyInstaller/hooks/hook-eth_abi.py index e7b1611229..42806f8b55 100644 --- a/PyInstaller/hooks/hook-eth_abi.py +++ b/PyInstaller/hooks/hook-eth_abi.py @@ -7,9 +7,6 @@ # The full license is in the file COPYING.txt, distributed with this software. #----------------------------------------------------------------------------- -# Hook for the eth-abi package: https://pypi.python.org/pypi/eth-abi -# Tested with eth-utils 0.5.0 and Python 3.5.2, on Ubuntu Linux x64 - from PyInstaller.utils.hooks import copy_metadata datas = copy_metadata("eth_abi") diff --git a/PyInstaller/hooks/hook-eth_account.py b/PyInstaller/hooks/hook-eth_account.py new file mode 100644 index 0000000000..b67a60808b --- /dev/null +++ b/PyInstaller/hooks/hook-eth_account.py @@ -0,0 +1,12 @@ +#----------------------------------------------------------------------------- +# Copyright (c) 2018-2018, 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. +#----------------------------------------------------------------------------- + +from PyInstaller.utils.hooks import copy_metadata + +datas = copy_metadata("eth_account") diff --git a/PyInstaller/hooks/hook-eth_keyfile.py b/PyInstaller/hooks/hook-eth_keyfile.py new file mode 100644 index 0000000000..aa241b1806 --- /dev/null +++ b/PyInstaller/hooks/hook-eth_keyfile.py @@ -0,0 +1,12 @@ +#----------------------------------------------------------------------------- +# Copyright (c) 2018-2018, 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. +#----------------------------------------------------------------------------- + +from PyInstaller.utils.hooks import copy_metadata + +datas = copy_metadata("eth_keyfile") diff --git a/PyInstaller/hooks/hook-eth_utils.py b/PyInstaller/hooks/hook-eth_utils.py index 865d59dc12..22e3676e01 100644 --- a/PyInstaller/hooks/hook-eth_utils.py +++ b/PyInstaller/hooks/hook-eth_utils.py @@ -7,9 +7,6 @@ # The full license is in the file COPYING.txt, distributed with this software. #----------------------------------------------------------------------------- -# Hook for the eth-utils package: https://pypi.python.org/pypi/eth-utils -# Tested with eth-utils 0.8.1 and Python 3.5.2, on Ubuntu Linux x64 - from PyInstaller.utils.hooks import copy_metadata datas = copy_metadata("eth_utils") diff --git a/PyInstaller/hooks/hook-web3.py b/PyInstaller/hooks/hook-web3.py index 1932bea159..07f39db16b 100644 --- a/PyInstaller/hooks/hook-web3.py +++ b/PyInstaller/hooks/hook-web3.py @@ -7,9 +7,6 @@ # The full license is in the file COPYING.txt, distributed with this software. #----------------------------------------------------------------------------- -# Hook for the web3 package: https://pypi.python.org/pypi/web3 -# Tested with web3 3.16.5 and Python 3.5.2, on Ubuntu Linux x64 - from PyInstaller.utils.hooks import copy_metadata datas = copy_metadata("web3") diff --git a/tests/functional/test_libraries.py b/tests/functional/test_libraries.py index ed5e54c017..72a43b1807 100644 --- a/tests/functional/test_libraries.py +++ b/tests/functional/test_libraries.py @@ -810,6 +810,7 @@ def test_uvloop(pyi_builder): def test_web3(pyi_builder): pyi_builder.test_source("import web3") + @importorskip('phonenumbers') def test_phonenumbers(pyi_builder): pyi_builder.test_source(""" diff --git a/tests/requirements-libraries.txt b/tests/requirements-libraries.txt index c35a9566f5..d2b9b99f4a 100644 --- a/tests/requirements-libraries.txt +++ b/tests/requirements-libraries.txt @@ -7,7 +7,6 @@ # these hooks. # Django==1.8.18 # pyup: ignore -web3==3.16.5 # pyup: ignore requests==2.15.1 # pyup: ignore # The gevent hook only supports an old version, which lacks wheels for # Python 3.7. @@ -94,3 +93,6 @@ twisted==18.7.0; python_version == '2.7' # Python 3.4 wheel. pywin32==223; python_version != '3.4' and sys_platform == 'win32' pypiwin32==219; python_version == '3.4' and sys_platform == 'win32' # pyup: ignore + +# Web3 supports Python 3.5 and up. +web3==4.5.0; python_version >= '3.5' \ No newline at end of file