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.

Sign up for GitHub

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

Jump to bottom

python-telegram-bot: fix vendored urllib patches #78434

Merged
merged 2 commits into from Jan 24, 2020
Merged

python-telegram-bot: fix vendored urllib patches #78434

merged 2 commits into from Jan 24, 2020

Conversation

pingiun
Copy link
Member

@pingiun pingiun commented Jan 24, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Previously using the package would result in an ImportError, because one of the vendored urllib3 imports was not replaced.

@pingiun pingiun changed the title Update python telegram bot patch python-telegram-bot: fix vendored urllib patches Jan 24, 2020
@pingiun pingiun changed the title python-telegram-bot: fix vendored urllib patches WIP: python-telegram-bot: fix vendored urllib patches Jan 24, 2020
@ofborg ofborg bot requested a review from veprbl January 24, 2020 20:24
@pingiun pingiun changed the title WIP: python-telegram-bot: fix vendored urllib patches python-telegram-bot: fix vendored urllib patches Jan 24, 2020
jonringer
jonringer reviewed Jan 24, 2020
View reviewed changes
pkgs/development/python-modules/python-telegram-bot/default.nix
Comment on lines +26 to 28
--replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \
--replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField"

Copy link
Contributor

Choose a reason for hiding this comment

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

I feel like this should be upstreamed

Copy link
Member Author

Choose a reason for hiding this comment

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

An issue at the upstream repository already exists: python-telegram-bot/python-telegram-bot#1583

Copy link
Contributor

Choose a reason for hiding this comment

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

... hasn't seen any progress in 4 months... concerning :(

@jonringer
Copy link
Contributor

whats the motivation of this? I'm assuming some use case is broken?

jonringer
jonringer approved these changes Jan 24, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

otherwise, the diff LGTM

[4 built, 1 copied (0.2 MiB), 0.2 MiB DL]
https://github.com/NixOS/nixpkgs/pull/78434
3 package built
python27Packages.python-telegram-bot python37Packages.python-telegram-bot python38Packages.python-telegram-bot

Would like to see upstream support in maintaining their package.

@pingiun
Copy link
Member Author

pingiun commented Jan 24, 2020

whats the motivation of this? I'm assuming some use case is broken?

The current package is broken, because the import of the vendored package fails. I'm currently looking at the upstream issue to see if I can fix it, but in the mean time this PR should be merged so the nixos package is unbroken

@jonringer
Copy link
Contributor

@GrahamcOfBorg build python27Packages.python-telegram-bot python37Packages.python-telegram-bot python38Packages.python-telegram-bot

@jonringer jonringer merged commit d7cdc48 into NixOS:master Jan 24, 2020
@pingiun pingiun deleted the update-python-telegram-bot-patch branch January 25, 2020 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@veprbl veprbl Awaiting requested review from veprbl

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@pingiun @jonringer