diff --git a/contrib/build_bin.sh b/contrib/build_bin.sh index a502a36c4..99e2082e2 100755 --- a/contrib/build_bin.sh +++ b/contrib/build_bin.sh @@ -1,13 +1,15 @@ #! /bin/bash # Script for building standalone binary releases deterministically +set -ex + eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" pip install -U pip pip install poetry # Setup poetry and install the dependencies -poetry install +poetry install -E qt # We now need to remove debugging symbols and build id from the hidapi SO file so_dir=`dirname $(dirname $(poetry run which python))`/lib/python3.6/site-packages diff --git a/contrib/build_dist.sh b/contrib/build_dist.sh index b6b7d6b75..c8bd7fd36 100755 --- a/contrib/build_dist.sh +++ b/contrib/build_dist.sh @@ -1,13 +1,15 @@ #! /bin/bash # Script for building pypi distribution archives deterministically +set -ex + eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" pip install -U pip pip install poetry # Setup poetry and install the dependencies -poetry install +poetry install -E qt # Make the distribution archives for pypi poetry build -f wheel diff --git a/contrib/build_wine.sh b/contrib/build_wine.sh index 057a27d31..7b48b204e 100755 --- a/contrib/build_wine.sh +++ b/contrib/build_wine.sh @@ -1,7 +1,7 @@ #!/bin/bash # Script which sets up Wine and builds the Windows standalone binary -set -e +set -ex PYTHON_VERSION=3.6.8 @@ -67,7 +67,7 @@ TZ=UTC find ${lib_dir} -name '*.py' -type f -execdir touch -t "201901010000.00" # Install python dependencies POETRY="wine $PYHOME/Scripts/poetry.exe" sleep 5 # For some reason, pausing for a few seconds makes the next step work -$POETRY install +$POETRY install -E qt # make the ui files pushd hwilib/ui diff --git a/contrib/generate-ui.sh b/contrib/generate-ui.sh index 980a87c24..9fc982ea9 100755 --- a/contrib/generate-ui.sh +++ b/contrib/generate-ui.sh @@ -1,10 +1,12 @@ #! /bin/bash +set -ex + pushd hwilib/ui for file in *.ui do gen_file=ui_`echo $file| cut -d. -f1`.py pyside2-uic $file -o $gen_file - sed -i '' -e 's/raise()/raise_()/g' $gen_file + sed -i'' -e 's/raise()/raise_()/g' $gen_file done popd diff --git a/contrib/generate_setup.sh b/contrib/generate_setup.sh index 5e944761a..3e3424d8a 100755 --- a/contrib/generate_setup.sh +++ b/contrib/generate_setup.sh @@ -1,10 +1,10 @@ #! /bin/bash # Generates the setup.py file -set -e +set -ex # Setup poetry and install the dependencies -poetry install +poetry install -E qt # Build the source distribution poetry build -f sdist diff --git a/poetry.lock b/poetry.lock index b15464142..f35a1d742 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4,7 +4,7 @@ description = "Python graph (network) package" name = "altgraph" optional = false python-versions = "*" -version = "0.16.1" +version = "0.17" [[package]] category = "dev" @@ -12,40 +12,43 @@ description = "A tool that automatically formats Python code to conform to the P name = "autopep8" optional = false python-versions = "*" -version = "1.4.4" +version = "1.5.2" [package.dependencies] -pycodestyle = ">=2.4.0" +pycodestyle = ">=2.5.0" [[package]] -category = "main" -description = "ECDSA cryptographic signature library (pure python)" -name = "ecdsa" +category = "dev" +description = "Python 2.7 backport of the \"dis\" module from Python 3.5+" +name = "dis3" optional = false python-versions = "*" -version = "0.13.2" +version = "0.1.3" [[package]] -category = "dev" -description = "Discover and load entry points from installed packages." -name = "entrypoints" +category = "main" +description = "ECDSA cryptographic signature library (pure python)" +name = "ecdsa" optional = false -python-versions = ">=2.7" -version = "0.3" +python-versions = "*" +version = "0.13.3" [[package]] category = "dev" -description = "the modular source code checker: pep8, pyflakes and co" +description = "the modular source code checker: pep8 pyflakes and co" name = "flake8" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "3.7.8" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "3.8.1" [package.dependencies] -entrypoints = ">=0.3.0,<0.4.0" mccabe = ">=0.6.0,<0.7.0" -pycodestyle = ">=2.5.0,<2.6.0" -pyflakes = ">=2.1.0,<2.2.0" +pycodestyle = ">=2.6.0a1,<2.7.0" +pyflakes = ">=2.2.0,<2.3.0" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" [[package]] category = "dev" @@ -54,7 +57,7 @@ marker = "sys_platform == \"win32\"" name = "future" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -version = "0.17.1" +version = "0.18.2" [[package]] category = "main" @@ -67,13 +70,29 @@ version = "0.7.99.post21" [package.dependencies] setuptools = ">=19.0" +[[package]] +category = "dev" +description = "Read metadata from Python packages" +marker = "python_version < \"3.8\"" +name = "importlib-metadata" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +version = "1.6.0" + +[package.dependencies] +zipp = ">=0.5" + +[package.extras] +docs = ["sphinx", "rst.linker"] +testing = ["packaging", "importlib-resources"] + [[package]] category = "main" description = "Pure-python wrapper for libusb-1.0" name = "libusb1" optional = false python-versions = "*" -version = "1.7.1" +version = "1.8" [[package]] category = "dev" @@ -82,7 +101,7 @@ marker = "sys_platform == \"darwin\"" name = "macholib" optional = false python-versions = "*" -version = "1.11" +version = "1.14" [package.dependencies] altgraph = ">=0.15" @@ -140,7 +159,7 @@ description = "Python style guide checker" name = "pycodestyle" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.5.0" +version = "2.6.0" [[package]] category = "dev" @@ -148,30 +167,31 @@ description = "passive checker of Python programs" name = "pyflakes" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.1.1" +version = "2.2.0" [[package]] category = "dev" description = "PyInstaller bundles a Python application and all its dependencies into a single package." name = "pyinstaller" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "3.5" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "3.6" [package.dependencies] altgraph = "*" +dis3 = "*" setuptools = "*" [[package]] category = "main" description = "Python bindings for the Qt cross-platform application and UI framework" name = "pyside2" -optional = false +optional = true python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.9" -version = "5.14.0" +version = "5.14.2.1" [package.dependencies] -shiboken2 = "5.14.0" +shiboken2 = "5.14.2.1" [[package]] category = "dev" @@ -186,53 +206,139 @@ version = "0.2.0" category = "main" description = "Python / C++ bindings helper module" name = "shiboken2" -optional = false +optional = true python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.9" -version = "5.14.0" +version = "5.14.2.1" [[package]] category = "main" -description = "Type Hints for Python" -name = "typing" +description = "Backported and Experimental Type Hints for Python 3.5+" +name = "typing-extensions" optional = false python-versions = "*" -version = "3.7.4.1" +version = "3.7.4.2" [[package]] -category = "main" -description = "Backported and Experimental Type Hints for Python 3.5+" -name = "typing-extensions" +category = "dev" +description = "Backport of pathlib-compatible object wrapper for zip files" +marker = "python_version < \"3.8\"" +name = "zipp" optional = false -python-versions = "*" -version = "3.7.4" +python-versions = ">=3.6" +version = "3.1.0" -[package.dependencies] -typing = ">=3.7.4" +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["jaraco.itertools", "func-timeout"] + +[extras] +qt = ["pyside2"] [metadata] -content-hash = "e076be1de3ff88d71f7ed62865dc7f4ecc424ef5d409cc1b7db578021961164a" +content-hash = "bce2677f0c45cb74f03eecfab2094577eed8fb16fe305a21c924128c4faa1b47" python-versions = "^3.6,<3.9" -[metadata.hashes] -altgraph = ["d6814989f242b2b43025cba7161fc1b8fb487a62cd49c49245d6fd01c18ac997", "ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c"] -autopep8 = ["4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee"] -ecdsa = ["20c17e527e75acad8f402290e158a6ac178b91b881f941fc6ea305bfdfb9657c", "5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884"] -entrypoints = ["589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"] -flake8 = ["19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548", "8e9dfa3cecb2400b3738a42c54c3043e821682b9c840b0448c0503f781130696"] -future = ["67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8"] -hidapi = ["1ac170f4d601c340f2cd52fd06e85c5e77bad7ceac811a7bb54b529f7dc28c24", "6424ad75da0021ce8c1bcd78056a04adada303eff3c561f8d132b85d0a914cb3", "8d3be666f464347022e2b47caf9132287885d9eacc7895314fc8fefcb4e42946", "92878bad7324dee619b7832fbfc60b5360d378aa7c5addbfef0a410d8fd342c7", "b4b1f6aff0192e9be153fe07c1b7576cb7a1ff52e78e3f76d867be95301a8e87", "bf03f06f586ce7d8aeb697a94b7dba12dc9271aae92d7a8d4486360ff711a660", "c76de162937326fcd57aa399f94939ce726242323e65c15c67e183da1f6c26f7", "d4ad1e46aef98783a9e6274d523b8b1e766acfc3d72828cd44a337564d984cfa", "d4b5787a04613503357606bb10e59c3e2c1114fa00ee328b838dd257f41cbd7b", "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97", "edfb16b16a298717cf05b8c8a9ad1828b6ff3de5e93048ceccd74e6ae4ff0922"] -libusb1 = ["adf64a4f3f5c94643a1286f8153bcf4bc787c348b38934aacd7fe17fbeebc571"] -macholib = ["ac02d29898cf66f27510d8f39e9112ae00590adb4a48ec57b25028d6962b1ae1", "c4180ffc6f909bf8db6cd81cff4b6f601d575568f4d5dee148c830e9851eb9db"] -mccabe = ["ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", "dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"] -mnemonic = ["02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d"] -pbkdf2 = ["ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979"] -pefile = ["a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645"] -pyaes = ["02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f"] -pycodestyle = ["95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56", "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"] -pyflakes = ["17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"] -pyinstaller = ["ee7504022d1332a3324250faf2135ea56ac71fdb6309cff8cd235de26b1d0a96"] -pyside2 = ["11bba54a62bcd9d7879d3e74cc54c0054c8c6dcdf011ecee9b47c5229cbd7af9", "578b727a5a254cfd509ea2f1fa31779f217a2a1d765c770727662dac950d60eb", "72feeb655958791383085bcb3154f6b3e193c1d66b6aa771c4244a6cafd62b7e", "77474e11c0bb3efa2d7e8506fe0f36049585ba911b8242e070b5f8978e5ba6f7", "c9f59e8c49a9a3b0cca04d8468becd8a562eb9ad0ac1d4d9a8622d2dfa3ce4c9", "ce43f98333443242cd3fe976d72fcb3acf6bb7fa40dd5949e59947a501d5dd72"] -pywin32-ctypes = ["24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942", "9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"] -shiboken2 = ["101fc366798f88cbff13586907f3755bebbd9304e66626fb6b0f6b28e0c9a5d2", "47c7c2652f578b37588e8b6daff3a852b3c88ae0f83be13886e4a74859e81763", "4f138656fc755399776062c89492d61f887d4e5fe7c78cded73917e80afcf2f5", "676fef81e4d95b02816fde7359c1f2604efa3edd34b05ab0da42c57c7555f7d7", "a88267c7cc17501effc6b1b36d85e7ab28173af939b975ea42716ed12493b478", "ab3ba84784c9641a11a21a8c64d494fa8b57be25e081e77f76747d543699f03c"] -typing = ["91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23", "c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36", "f38d83c5a7a7086543a0f649564d661859c5146a85775ab90c0d2f93ffaa9714"] -typing-extensions = ["2ed632b30bb54fc3941c382decfd0ee4148f5c591651c9272473fea2c6397d95", "b1edbbf0652660e32ae780ac9433f4231e7339c7f9a8057d0f042fcbcea49b87", "d8179012ec2c620d3791ca6fe2bf7979d979acdbef1fca0bc56b37411db682ed"] +[metadata.files] +altgraph = [ + {file = "altgraph-0.17-py2.py3-none-any.whl", hash = "sha256:c623e5f3408ca61d4016f23a681b9adb100802ca3e3da5e718915a9e4052cebe"}, + {file = "altgraph-0.17.tar.gz", hash = "sha256:1f05a47122542f97028caf78775a095fbe6a2699b5089de8477eb583167d69aa"}, +] +autopep8 = [ + {file = "autopep8-1.5.2.tar.gz", hash = "sha256:152fd8fe47d02082be86e05001ec23d6f420086db56b17fc883f3f965fb34954"}, +] +dis3 = [ + {file = "dis3-0.1.3-py2-none-any.whl", hash = "sha256:61f7720dd0d8749d23fda3d7227ce74d73da11c2fade993a67ab2f9852451b14"}, + {file = "dis3-0.1.3-py3-none-any.whl", hash = "sha256:30b6412d33d738663e8ded781b138f4b01116437f0872aa56aa3adba6aeff218"}, + {file = "dis3-0.1.3.tar.gz", hash = "sha256:9259b881fc1df02ed12ac25f82d4a85b44241854330b1a651e40e0c675cb2d1e"}, +] +ecdsa = [ + {file = "ecdsa-0.13.3-py2.py3-none-any.whl", hash = "sha256:9814e700890991abeceeb2242586024d4758c8fc18445b194a49bd62d85861db"}, + {file = "ecdsa-0.13.3.tar.gz", hash = "sha256:163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d"}, +] +flake8 = [ + {file = "flake8-3.8.1-py2.py3-none-any.whl", hash = "sha256:6c1193b0c3f853ef763969238f6c81e9e63ace9d024518edc020d5f1d6d93195"}, + {file = "flake8-3.8.1.tar.gz", hash = "sha256:ea6623797bf9a52f4c9577d780da0bb17d65f870213f7b5bcc9fca82540c31d5"}, +] +future = [ + {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, +] +hidapi = [ + {file = "hidapi-0.7.99.post21-cp27-cp27m-win32.whl", hash = "sha256:bf03f06f586ce7d8aeb697a94b7dba12dc9271aae92d7a8d4486360ff711a660"}, + {file = "hidapi-0.7.99.post21-cp27-cp27m-win_amd64.whl", hash = "sha256:1ac170f4d601c340f2cd52fd06e85c5e77bad7ceac811a7bb54b529f7dc28c24"}, + {file = "hidapi-0.7.99.post21-cp34-cp34m-win32.whl", hash = "sha256:d4ad1e46aef98783a9e6274d523b8b1e766acfc3d72828cd44a337564d984cfa"}, + {file = "hidapi-0.7.99.post21-cp34-cp34m-win_amd64.whl", hash = "sha256:c76de162937326fcd57aa399f94939ce726242323e65c15c67e183da1f6c26f7"}, + {file = "hidapi-0.7.99.post21-cp35-cp35m-win32.whl", hash = "sha256:d4b5787a04613503357606bb10e59c3e2c1114fa00ee328b838dd257f41cbd7b"}, + {file = "hidapi-0.7.99.post21-cp35-cp35m-win_amd64.whl", hash = "sha256:b4b1f6aff0192e9be153fe07c1b7576cb7a1ff52e78e3f76d867be95301a8e87"}, + {file = "hidapi-0.7.99.post21-cp36-cp36m-win32.whl", hash = "sha256:edfb16b16a298717cf05b8c8a9ad1828b6ff3de5e93048ceccd74e6ae4ff0922"}, + {file = "hidapi-0.7.99.post21-cp36-cp36m-win_amd64.whl", hash = "sha256:8d3be666f464347022e2b47caf9132287885d9eacc7895314fc8fefcb4e42946"}, + {file = "hidapi-0.7.99.post21-cp37-cp37m-win32.whl", hash = "sha256:92878bad7324dee619b7832fbfc60b5360d378aa7c5addbfef0a410d8fd342c7"}, + {file = "hidapi-0.7.99.post21-cp37-cp37m-win_amd64.whl", hash = "sha256:6424ad75da0021ce8c1bcd78056a04adada303eff3c561f8d132b85d0a914cb3"}, + {file = "hidapi-0.7.99.post21.tar.gz", hash = "sha256:e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97"}, +] +importlib-metadata = [ + {file = "importlib_metadata-1.6.0-py2.py3-none-any.whl", hash = "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f"}, + {file = "importlib_metadata-1.6.0.tar.gz", hash = "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"}, +] +libusb1 = [ + {file = "libusb1-1.8.tar.gz", hash = "sha256:240f65ac70ba3fab77749ec84a412e4e89624804cb80d6c9d394eef5af8878d6"}, +] +macholib = [ + {file = "macholib-1.14-py2.py3-none-any.whl", hash = "sha256:c500f02867515e6c60a27875b408920d18332ddf96b4035ef03beddd782d4281"}, + {file = "macholib-1.14.tar.gz", hash = "sha256:0c436bc847e7b1d9bda0560351bf76d7caf930fb585a828d13608839ef42c432"}, +] +mccabe = [ + {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, + {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, +] +mnemonic = [ + {file = "mnemonic-0.18.tar.gz", hash = "sha256:02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d"}, +] +pbkdf2 = [ + {file = "pbkdf2-1.3.tar.gz", hash = "sha256:ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979"}, +] +pefile = [ + {file = "pefile-2019.4.18.tar.gz", hash = "sha256:a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645"}, +] +pyaes = [ + {file = "pyaes-1.6.1.tar.gz", hash = "sha256:02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f"}, +] +pycodestyle = [ + {file = "pycodestyle-2.6.0-py2.py3-none-any.whl", hash = "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367"}, + {file = "pycodestyle-2.6.0.tar.gz", hash = "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"}, +] +pyflakes = [ + {file = "pyflakes-2.2.0-py2.py3-none-any.whl", hash = "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92"}, + {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"}, +] +pyinstaller = [ + {file = "PyInstaller-3.6.tar.gz", hash = "sha256:3730fa80d088f8bb7084d32480eb87cbb4ddb64123363763cf8f2a1378c1c4b7"}, +] +pyside2 = [ + {file = "PySide2-5.14.2.1-5.14.2-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:71d0416e69f0ac4d5d0f9892c819b2896a4e821bc83b29932769060119f3292c"}, + {file = "PySide2-5.14.2.1-5.14.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:7d5054009ced176cf78d71d2787bdcd676bc990004bec0e7079f7bdfe7edffe5"}, + {file = "PySide2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-abi3-macosx_10_13_intel.whl", hash = "sha256:a6390619b9c8713ba190dd3fa116a2d9f63597cb0f902fbf31b2657023936a3a"}, + {file = "PySide2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-abi3-manylinux1_x86_64.whl", hash = "sha256:174e1863ae3526bae8ae946b24cccb472dffd7e643bc47ae4d2de39cac583a9c"}, + {file = "PySide2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-none-win32.whl", hash = "sha256:e21058fcd8d2cb9871fc61f9d35ed15f0e0c4718c5d463a2e37be1d67b8c40b4"}, + {file = "PySide2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-none-win_amd64.whl", hash = "sha256:93c19beef80ef54392e6cd0de937be4e1603560229eb38738c8b50bbb8da90f7"}, +] +pywin32-ctypes = [ + {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, + {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, +] +shiboken2 = [ + {file = "shiboken2-5.14.2.1-5.14.2-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:d285d476a76f254bff69cc58c1d4385df295b42de1a818d4a8d11694c2d728fc"}, + {file = "shiboken2-5.14.2.1-5.14.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:73d03e74f542204e351539e42ab3e3727a69408e1497af4c6e84fb66c3e706d8"}, + {file = "shiboken2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-abi3-macosx_10_13_intel.whl", hash = "sha256:16b59490228bf923ea7c8ed6edcb4f7349ce5a5fc30369190c41487baf6d4aaa"}, + {file = "shiboken2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-abi3-manylinux1_x86_64.whl", hash = "sha256:cd6ba0ba0d070c8ec090ad3eb10440989f7e5a4404c6b087f8f695a75a01e1dc"}, + {file = "shiboken2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-none-win32.whl", hash = "sha256:fe4d0cf6737f1d01944be4cf3b401d74015c515ab84622bf04f47d64ffcd39f9"}, + {file = "shiboken2-5.14.2.1-5.14.2-cp35.cp36.cp37.cp38-none-win_amd64.whl", hash = "sha256:c022203b7cf01df6ad0bb190d286c2965958243a16e47bee8c5e6bbb9d0cd475"}, +] +typing-extensions = [ + {file = "typing_extensions-3.7.4.2-py2-none-any.whl", hash = "sha256:f8d2bd89d25bc39dabe7d23df520442fa1d8969b82544370e03d88b5a591c392"}, + {file = "typing_extensions-3.7.4.2-py3-none-any.whl", hash = "sha256:6e95524d8a547a91e08f404ae485bbb71962de46967e1b71a0cb89af24e761c5"}, + {file = "typing_extensions-3.7.4.2.tar.gz", hash = "sha256:79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae"}, +] +zipp = [ + {file = "zipp-3.1.0-py3-none-any.whl", hash = "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b"}, + {file = "zipp-3.1.0.tar.gz", hash = "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"}, +] diff --git a/pyproject.toml b/pyproject.toml index 675db3021..588bc5e2b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,10 @@ pyaes = "^1.6" mnemonic = "^0.18.0" typing-extensions = "^3.7" libusb1 = "^1.7" -pyside2 = "^5.14.0" +pyside2 = { version = "^5.14.0", optional = true } + +[tool.poetry.extras] +qt = ["pyside2"] [tool.poetry.dev-dependencies] pyinstaller = "^3.4" diff --git a/setup.py b/setup.py index 40b373ab3..809fab731 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,89 @@ 'hwilib.devices.trezorlib.transport'] package_data = \ -{'': ['*'], 'hwilib': ['udev/*', 'ui/*']} +{'': ['*'], + 'hwilib': ['udev/*', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/displayaddressdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getkeypooloptionsdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/getxpubdialog.ui', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/hwiqt.pyproject', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/mainwindow.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/sendpindialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/setpassphrasedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signmessagedialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui', + 'ui/signpsbtdialog.ui']} modules = \ ['hwi', 'hwi-qt'] @@ -21,9 +103,11 @@ 'libusb1>=1.7,<2.0', 'mnemonic>=0.18.0,<0.19.0', 'pyaes>=1.6,<2.0', - 'pyside2>=5.14.0,<6.0.0', 'typing-extensions>=3.7,<4.0'] +extras_require = \ +{'qt': ['pyside2>=5.14.0,<6.0.0']} + entry_points = \ {'console_scripts': ['hwi = hwilib.cli:main', 'hwi-qt = hwilib.gui:main']} @@ -41,6 +125,7 @@ 'package_data': package_data, 'py_modules': modules, 'install_requires': install_requires, + 'extras_require': extras_require, 'entry_points': entry_points, 'python_requires': '>=3.6,<3.9', }