Skip to content

Commit

Permalink
Merge #538: Allow some older dependencies and regenerate setup.py
Browse files Browse the repository at this point in the history
a8f955a tests: Remove extraneous debug line (Andrew Chow)
8f6b7e9 deps: regenerate setup.py (Andrew Chow)
8719bfe deps: regenerate poetry.lock (Andrew Chow)
3fde13e deps: Allow older versions (Andrew Chow)

Pull request description:

  After #531, we updated dependencies but accidentally removed support for older versions that aren't actually incompatible with our usage. So re-allow those. Also regenerates the setup.py which I forgot to do.

  Closes #537

Top commit has no ACKs.

Tree-SHA512: 86e520c8444a1cd9985beb0a4a0081d07d6e4d4fce958fd133743c20cafb07bf9fa31927308e7519a4fdf3b287d4c2d8de02a8160cc9d24d9ce8f535b07f017f
  • Loading branch information
achow101 committed Oct 26, 2021
2 parents 8c6763b + a8f955a commit 8c1b50a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
21 changes: 12 additions & 9 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ecdsa = "~0"
pyaes = "^1.6"
mnemonic = "~0"
typing-extensions = "^3.7"
libusb1 = "^2.0"
libusb1 = ">=1.7,<3"
pyside2 = { version = "^5.14.0", optional = true, python = "<3.10" }
bitbox02 = ">=5.3.0,<6.0.0"

Expand All @@ -32,9 +32,9 @@ qt = ["pyside2"]
[tool.poetry.dev-dependencies]
pyinstaller = "^4.0"
autopep8 = "~1"
flake8 = "~4"
flake8 = ">=3"
mypy = "~0"
sphinx = "~4"
sphinx = ">=4"
sphinx-rtd-theme = "~1"
sphinxcontrib-autoprogram = "~0"

Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
['bitbox02>=5.3.0,<6.0.0',
'ecdsa>=0,<1',
'hidapi>=0,<1',
'libusb1>=1.7,<2.0',
'libusb1>=1.7,<3',
'mnemonic>=0,<1',
'pyaes>=1.6,<2.0',
'typing-extensions>=3.7,<4.0']

extras_require = \
{'qt': ['pyside2>=5.14.0,<6.0.0']}
{'qt:python_version < "3.10"': ['pyside2>=5.14.0,<6.0.0']}

entry_points = \
{'console_scripts': ['hwi = hwilib._cli:main', 'hwi-qt = hwilib._gui:main']}
Expand All @@ -46,7 +46,7 @@
'install_requires': install_requires,
'extras_require': extras_require,
'entry_points': entry_points,
'python_requires': '>=3.6,<3.10',
'python_requires': '>=3.6,<4.0',
}


Expand Down
1 change: 0 additions & 1 deletion test/test_keepkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ def test_passphrase(self):

# A passphrase will need to be sent
result = self.do_command(self.dev_args + ['enumerate'])
print(result)
for dev in result:
if dev['type'] == 'keepkey' and dev['path'] == 'udp:127.0.0.1:11044':
self.assertTrue(dev['needs_passphrase_sent'])
Expand Down

0 comments on commit 8c1b50a

Please sign in to comment.