Navigation Menu

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

Jump to bottom

electrum: 3.2.4 -> 3.3.2 plus new dependencies #54466

Merged
merged 4 commits into from Jan 22, 2019
Merged

electrum: 3.2.4 -> 3.3.2 plus new dependencies #54466

merged 4 commits into from Jan 22, 2019

Conversation

nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Jan 22, 2019 •
edited

Motivation for this change

Previous PR was closed, I applied required fixes
⚠️ I did not test execution at this time

Also the aio libraries are missing tests, maybe they are not included in the Pypi package

cc @clefru @dotlambda

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@clefru
Copy link
Contributor

clefru commented Jan 22, 2019

Previous PR was closed, I applied required fixes

LGTM. Thank you!

I did not test execution at this time

Ran result/bin/electrum and created a test wallet. Works for me.

@clefru
Copy link
Contributor

clefru commented Jan 22, 2019

@GrahamcOfBorg build electrum

dotlambda
dotlambda requested changes Jan 22, 2019
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Also the aio libraries are missing tests, maybe they are not included in the Pypi package

Yes, the tests/ directory is missing in both tarballs. Please add doCheck = false and a comment with the reason.

pkgs/top-level/python-packages.nix Outdated Show resolved Hide resolved
@dotlambda
Copy link
Member

Also don't forget to squash your commits such that only three are remaining.

@nyanloutre
Copy link
Member Author

@dotlambda I could also fetch the libraries from GitHub to get the tests

@dotlambda
Copy link
Member

@dotlambda I could also fetch the libraries from GitHub to get the tests

That's up to you. However, I suspect at least the aiohttp-socks tests to fail due to accessing the network.

@nyanloutre
Copy link
Member Author

@dotlambda even worse the tests depend on a binary contained in the repo

@nyanloutre
Copy link
Member Author

@dotlambda I enabled the tests for electrum but I am not sure if it will work on MacOS. Could you trigger a borg build ?

@nyanloutre
Copy link
Member Author

I will squash commits once everything is validated

@veprbl
Copy link
Member

veprbl commented Jan 22, 2019

@GrahamcOfBorg build electrum

dotlambda
dotlambda requested changes Jan 22, 2019
View reviewed changes
pkgs/applications/misc/electrum/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/aiohttp-socks/default.nix

propagatedBuildInputs = [ aiohttp ];

# Checks needs internet access
Copy link
Member

Choose a reason for hiding this comment

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

I don't think so, but they use localhost, to which access is denied in the sandbox.

Copy link
Member Author

Choose a reason for hiding this comment

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

Isn't this a remote address ? https://github.com/romis2012/aiohttp-socks/blob/3252f4bdd37fb9a7360481977f800189cb3e3aca/tests/test_socks.py#L18

Copy link
Member

Choose a reason for hiding this comment

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

Indeed, it is. Sorry.

pkgs/development/python-modules/aiorpcx/default.nix

disabled = pythonOlder "3.6";

# Checks needs internet access
Copy link
Member

Choose a reason for hiding this comment

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

no

Copy link
Member Author

Choose a reason for hiding this comment

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

I spotted a remote address used here : https://github.com/kyuupichan/aiorpcX/blob/d8568f6c1865d1927034e05807a412b08c6d7526/tests/test_socks.py#L15

dotlambda
dotlambda approved these changes Jan 22, 2019
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

LGTM, apart from squashing the commits. Did not test any functionality.

clefru and others added 3 commits January 22, 2019 17:04
@clefru @nyanloutre
pythonPackages.aiohttp-socks: init at 0.2.2
6fefd37 
Co-authored-by: nyanloutre <paul@nyanlout.re>
@clefru @nyanloutre
pythonPackages.aiorpcx: init at 0.10.2
4b76001 
Co-authored-by: nyanloutre <paul@nyanlout.re>
@clefru @nyanloutre
electrum: 3.2.4 -> 3.3.2
ee0e998 
Co-authored-by: nyanloutre <paul@nyanlout.re>
@nyanloutre
Copy link
Member Author

@dotlambda do you want it to be more squashed ?

@dotlambda
Copy link
Member

The last two could be squashed together :)

@nyanloutre
Copy link
Member Author

done

@dotlambda dotlambda merged commit fa8ed83 into NixOS:master Jan 22, 2019
@dotlambda
Copy link
Member

Thanks a lot!

@nyanloutre nyanloutre deleted the electrum-update branch January 22, 2019 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nyanloutre @clefru @dotlambda @veprbl @GrahamcOfBorg