Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update dependencies #2109

Merged
merged 2 commits into from
Feb 15, 2022
Merged

chore: update dependencies #2109

merged 2 commits into from
Feb 15, 2022

Conversation

prusnak
Copy link
Member

@prusnak prusnak commented Feb 8, 2022

No description provided.

@mmilata
Copy link
Member

mmilata commented Feb 9, 2022

Looks like black is failing: https://gitlab.com/satoshilabs/trezor/trezor-firmware/-/jobs/2069163728#L3039
Otherwise LGTM, will leave up to @matejcik if it's time to remove 3.6 yet.

@matejcik
Copy link
Contributor

matejcik commented Feb 9, 2022

As I said before, I would like to keep Python 3.6 compatibility in trezorlib for as long as it is not a burden.

If including Python 3.6 in CI is problematic, we can drop it, but I'd keep it in tox and keep the package requirements as-is

@prusnak prusnak changed the title chore: update dependencies, drop Python 3.6 support (EOL) chore: update dependencies Feb 11, 2022
@prusnak
Copy link
Member Author

prusnak commented Feb 11, 2022

Reworked the PR to keep Py3.6 compatibility

@matejcik
Copy link
Contributor

Reworked the PR to keep Py3.6 compatibility

wasn't the previous version where pillow is 0.9 working for some reason?

@prusnak
Copy link
Member Author

prusnak commented Feb 11, 2022

wasn't the previous version where pillow is 0.9 working for some reason?

Pillow 0.9.x is not compatible with Py3.6

Pillow 0.8.4 works on my machine, Pillow 0.8.1 (originally suggested) doesn't.

@matejcik
Copy link
Contributor

Pillow 0.9.x is not compatible with Py3.6

I don't understand why that is a problem in poetry env. Tox is not using that and we aren't either.

@prusnak
Copy link
Member Author

prusnak commented Feb 11, 2022

One more force push - 7b62c92 - pyproject.toml set to Py3.7, trezorlib kept at 3.6

@prusnak
Copy link
Member Author

prusnak commented Feb 11, 2022

@mmilata any idea why pyright is now missing?

@matejcik
Copy link
Contributor

do you maybe need to rerun the pyright generator script? https://github.com/trezor/trezor-firmware/blob/master/ci/pyright/README.md

@prusnak
Copy link
Member Author

prusnak commented Feb 11, 2022

do you maybe need to rerun the pyright generator script? https://github.com/trezor/trezor-firmware/blob/master/ci/pyright/README.md

I tried it ... it refreshed lots of dependencies of pyright, but result is still the same - the environment does not have pyright in path.

@mmilata
Copy link
Member

mmilata commented Feb 11, 2022

Looks like pyright gets built but for some reason the bin -> lib/node_modules/.bin symlink disappeared, figuring out why ...

@mmilata
Copy link
Member

mmilata commented Feb 11, 2022

Ah, there's no lib/node_modules/.bin either, and pyright is lib/node_modules/pyright/index.js. Doesn't explain what happened though.

@mmilata
Copy link
Member

mmilata commented Feb 11, 2022

Seems to be related to nodejs 14->16 update: NixOS/nixpkgs#145432. My attempt for workaround: 91182cf. Other possibility is to create the symlinks manually in postInstall hook.

@prusnak
Copy link
Member Author

prusnak commented Feb 11, 2022

Seems to be related to nodejs 14->16 update: NixOS/nixpkgs#145432. My attempt for workaround: 91182cf. Other possibility is to create the symlinks manually in postInstall hook.

Thanks, that did the trick. Cherry-picked and rebased and force-pushed.

Copy link
Member

@mmilata mmilata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good, though ti seems pylint became more stricter and fails: https://gitlab.com/satoshilabs/trezor/trezor-firmware/-/jobs/2083350519

@matejcik
Copy link
Contributor

more like pylint changed the ignore list format AGAIN 😠 i'll fix it later if nobody else beats me to it

prusnak and others added 2 commits February 14, 2022 14:21
[no changelog]

Co-Authored-By: Martin Milata <martin@martinmilata.cz>
@matejcik
Copy link
Contributor

it's actually still the same issue that prevented me from updating the last time: pylint-dev/pylint#5491
fixed by removing leading ./ from paths passed in

Copy link
Member

@mmilata mmilata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI passes, let's merge.

@matejcik matejcik merged commit a532bf0 into master Feb 15, 2022
@matejcik matejcik deleted the update-deps branch February 15, 2022 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants