pythonPackages.magic-wormhole: 0.10.4 -> 0.10.5 #35175

dotlambda · 2018-02-19T12:39:22Z

Motivation for this change

magic-wormhole is broken on master

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
Fits CONTRIBUTING.md.

asymmetric · 2018-02-19T13:03:39Z

pkgs/development/python-modules/magic-wormhole/default.nix

  propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ];

  postPatch = ''
    sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
    sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py
-  '' + lib.optionalString (pythonAtLeast "3.3") ''


Also explaining why this was removed would be nice.

Because of magic-wormhole/magic-wormhole@13b1539, which happened after the 0.10.5 release as I see right now.
I can however revert that change if you want.

asymmetric · 2018-02-19T13:04:03Z

pkgs/development/python-modules/magic-wormhole/default.nix

@@ -3,7 +3,6 @@
 , fetchPypi
 , pythonAtLeast
 , nettools
-, glibcLocales


Could you edit the second commit message and explain why you removed this?

Tests work without it, so why should it be included?

Did you try to run the binaries? Asking because the checkbox isn't ticked. 👍

No I didn't since I don't use magic-wormhole. I just came across the build failure.
However, I only ever saw glibcLocales added to make the tests run by setting something like LC_ALL.

asymmetric · 2018-02-19T13:06:32Z

pkgs/development/python-modules/magic-wormhole/default.nix

@@ -22,30 +21,25 @@

 buildPythonPackage rec {
  pname = "magic-wormhole";
-  version = "0.10.4";
-  name = "${pname}-${version}";


For my interest, is name not needed?

Not anymore for buildPython*.

FRidh · 2018-02-19T14:06:24Z

The version bump is already in staging, so this shouldn't be merged until staging has been merged into master.

dotlambda · 2018-02-19T14:48:36Z

Rebased on staging.
@asymmetric Can you try running it?

asymmetric · 2018-02-19T15:24:56Z

Tests fail for me when running nix-build -A pythonPackages.magic-wormhole on your branch.

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/trial/runner.py", line 508, in loadPackage
    module = modinfo.load()
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/modules.py", line 392, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 308, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 255, in _importAndCheckStack
    reraise(excValue, excTraceback)
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/test_args.py", line 6, in <module>
    from .common import config
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/common.py", line 10, in <module>
    from wormhole_transit_relay.transit_server import Transit
exceptions.ImportError: No module named wormhole_transit_relay.transit_server

wormhole.test.test_args
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/trial/runner.py", line 508, in loadPackage
    module = modinfo.load()
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/modules.py", line 392, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 308, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 255, in _importAndCheckStack
    reraise(excValue, excTraceback)
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/test_cli.py", line 15, in <module>
    from .common import ServerBase, config
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/common.py", line 10, in <module>
    from wormhole_transit_relay.transit_server import Transit
exceptions.ImportError: No module named wormhole_transit_relay.transit_server

wormhole.test.test_cli
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/trial/runner.py", line 508, in loadPackage
    module = modinfo.load()
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/modules.py", line 392, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 308, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 255, in _importAndCheckStack
    reraise(excValue, excTraceback)
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/test_server.py", line 9, in <module>
    from .common import ServerBase
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/common.py", line 10, in <module>
    from wormhole_transit_relay.transit_server import Transit
exceptions.ImportError: No module named wormhole_transit_relay.transit_server

wormhole.test.test_server
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/trial/runner.py", line 508, in loadPackage
    module = modinfo.load()
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/modules.py", line 392, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 308, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 255, in _importAndCheckStack
    reraise(excValue, excTraceback)
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/test_transit.py", line 13, in <module>
    from wormhole_transit_relay import transit_server
exceptions.ImportError: No module named wormhole_transit_relay

wormhole.test.test_transit
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/trial/runner.py", line 508, in loadPackage
    module = modinfo.load()
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/modules.py", line 392, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 308, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 255, in _importAndCheckStack
    reraise(excValue, excTraceback)
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/test_wormhole.py", line 8, in <module>
    from .common import ServerBase, poll_until, pause_one_tick
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/common.py", line 10, in <module>
    from wormhole_transit_relay.transit_server import Transit
exceptions.ImportError: No module named wormhole_transit_relay.transit_server

wormhole.test.test_wormhole
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/trial/runner.py", line 508, in loadPackage
    module = modinfo.load()
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/modules.py", line 392, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 308, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/nix/store/j5c4dbylqxhwphkkcm8ylirdgayfi40n-python2.7-Twisted-17.9.0/lib/python2.7/site-packages/twisted/python/reflect.py", line 255, in _importAndCheckStack
    reraise(excValue, excTraceback)
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/test_xfer_util.py", line 5, in <module>
    from .common import ServerBase
  File "/nix/store/i5sixyl4anhbrxnl4bv2z7y1bhlddihp-python2.7-magic-wormhole-0.10.4/lib/python2.7/site-packages/wormhole/test/common.py", line 10, in <module>
    from wormhole_transit_relay.transit_server import Transit
exceptions.ImportError: No module named wormhole_transit_relay.transit_server

wormhole.test.test_xfer_util
-------------------------------------------------------------------------------
Ran 115 tests in 1.385s

FAILED (errors=6, successes=109)
builder for ‘/nix/store/xqrjsyd8sifz537688ha22zfdak6bgjn-python2.7-magic-wormhole-0.10.4.drv’ failed with exit code 1
error: build of ‘/nix/store/xqrjsyd8sifz537688ha22zfdak6bgjn-python2.7-magic-wormhole-0.10.4.drv’ failed

dotlambda · 2018-02-19T16:20:53Z

Sorry, I was not careful enough.
Second try. I had to package a new dependency.

dotlambda · 2018-02-19T16:22:21Z

pkgs/development/python-modules/magic-wormhole/default.nix

  buildInputs = [ nettools glibcLocales ];
-  propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity txtorcon ];
+  propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ];


Sorry that I changed the order so much. I just wanted the dependency to be in the same order as in setup.py.

Thanks for the info. In general though, I think it's a much better idea to have these comments in the commit messages, so that people could find out without having to find this PR.

Changed commit message.

asymmetric · 2018-02-19T22:31:03Z

It still fails for me, but not for the CI, so not sure.

dotlambda · 2018-02-19T23:21:11Z

@GrahamcOfBorg build python2.pkgs.magic-wormhole python3.pkgs.magic-wormhole

GrahamcOfBorg · 2018-02-19T23:43:35Z

Success on x86_64-linux (full log)

Partial log (click to expand)

wormhole.test.test_cli.PregeneratedCode.test_slow_text
wormhole.test.test_cli.PregeneratedCode.test_text
wormhole.test.test_cli.PregeneratedCode.test_text_subprocess
wormhole.test.test_cli.PregeneratedCode.test_text_tor
-------------------------------------------------------------------------------
Ran 355 tests in 28.345s

PASSED (skips=20, successes=335)
/nix/store/2r702zqgchn7fprfx95vb5144h6c6625-python2.7-magic-wormhole-0.10.5
/nix/store/h52alg3shyv9qsmcywdfb9rb99a3zcs3-python3.6-magic-wormhole-0.10.5

GrahamcOfBorg · 2018-02-20T00:51:14Z

Success on aarch64-linux (full log)

Partial log (click to expand)

wormhole.test.test_cli.PregeneratedCode.test_slow_text
wormhole.test.test_cli.PregeneratedCode.test_text
wormhole.test.test_cli.PregeneratedCode.test_text_subprocess
wormhole.test.test_cli.PregeneratedCode.test_text_tor
-------------------------------------------------------------------------------
Ran 355 tests in 72.673s

PASSED (skips=20, successes=335)
/nix/store/h7pxl15587mna9qwddlxdvxbfmhz2q72-python2.7-magic-wormhole-0.10.5
/nix/store/m0fcb1iv6g0fsd61za3fr2qgc0anqn4k-python3.6-magic-wormhole-0.10.5

dotlambda · 2018-02-21T08:49:06Z

@asymmetric Can you try again, please?

asymmetric · 2018-02-21T10:03:55Z

@dotlambda there were no new commits, AFAICT, so I don't think tests results would be different. Also, this being nix, we shouldn't have cases of "works on my machine", so I'd say go ahead and consider the build green, I must be doing something wrong.

grahamc · 2018-02-23T16:36:22Z

@GrahamcOfBorg eval

FRidh · 2018-02-24T07:44:22Z

pkgs/development/python-modules/magic-wormhole/transit-relay.nix

@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, twisted, mock }:


this is a separate package and should thus have its own folder

Add magic-wormhole-transit-relay dependency and clean up expression. Order of the buildInputs was changed to match the one in setup.py.

dotlambda · 2018-02-27T01:10:48Z

@GrahamcOfBorg build python2.pkgs.magic-wormhole python3.pkgs.magic-wormhole

GrahamcOfBorg · 2018-02-27T01:13:09Z

Success on aarch64-linux (full log)

Partial log (click to expand)

wormhole.test.test_cli.PregeneratedCode.test_slow_text
wormhole.test.test_cli.PregeneratedCode.test_text
wormhole.test.test_cli.PregeneratedCode.test_text_subprocess
wormhole.test.test_cli.PregeneratedCode.test_text_tor
-------------------------------------------------------------------------------
Ran 355 tests in 45.889s

PASSED (skips=20, successes=335)
/nix/store/n9fx2csyi3yz7xfhvrl6k0vz4s5rrn1h-python2.7-magic-wormhole-0.10.5
/nix/store/n0cnsz9wmc90ssk3gf6vxj6hvf7c72dj-python3.6-magic-wormhole-0.10.5

GrahamcOfBorg · 2018-02-27T02:27:52Z

Success on x86_64-linux (full log)

Partial log (click to expand)

wormhole.test.test_cli.PregeneratedCode.test_slow_text
wormhole.test.test_cli.PregeneratedCode.test_text
wormhole.test.test_cli.PregeneratedCode.test_text_subprocess
wormhole.test.test_cli.PregeneratedCode.test_text_tor
-------------------------------------------------------------------------------
Ran 355 tests in 19.709s

PASSED (skips=20, successes=335)
/nix/store/nwfcj3hd53a0p5sj33k70y9bvvy12prr-python2.7-magic-wormhole-0.10.5
/nix/store/wvbi7yzljcaygb5bhzy4zl2bidrzs4i5-python3.6-magic-wormhole-0.10.5

dotlambda requested a review from FRidh as a code owner February 19, 2018 12:39

GrahamcOfBorg added 6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Feb 19, 2018

asymmetric requested changes Feb 19, 2018

View reviewed changes

asymmetric reviewed Feb 19, 2018

View reviewed changes

FRidh added the 2.status: work-in-progress label Feb 19, 2018

dotlambda force-pushed the magic-wormhole branch from 9e74be7 to 51334f5 Compare February 19, 2018 14:46

dotlambda changed the base branch from master to staging February 19, 2018 14:46

dotlambda force-pushed the magic-wormhole branch from 51334f5 to 6ed30ae Compare February 19, 2018 14:47

dotlambda force-pushed the magic-wormhole branch from 6ed30ae to da0b5b1 Compare February 19, 2018 16:20

dotlambda commented Feb 19, 2018

View reviewed changes

dotlambda force-pushed the magic-wormhole branch from da0b5b1 to 750be45 Compare February 19, 2018 16:27

GrahamcOfBorg added the 8.has: package (new) label Feb 19, 2018

dotlambda mentioned this pull request Feb 23, 2018

pythonPackages.magic-wormhole: patch the call to 'locale' #35388

Merged

8 tasks

pythonPackages.spake2: 0.7 -> 0.8

d95b811

dotlambda force-pushed the magic-wormhole branch from 750be45 to dbc2c3a Compare February 23, 2018 13:57

dotlambda requested review from edwtjo, peti and ttuegel as code owners February 23, 2018 13:57

GrahamcOfBorg removed the 10.rebuild-linux: 1-10 label Feb 23, 2018

FRidh removed request for peti, edwtjo and ttuegel February 23, 2018 14:33

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ labels Feb 23, 2018

FRidh requested changes Feb 24, 2018

View reviewed changes

Robert Schütz added 2 commits February 24, 2018 10:53

pythonPackages.magic-wormhole-transit-relay: init at 0.1.1

ab54471

pythonPackages.magic-wormhole: fix build

bc25df2

Add magic-wormhole-transit-relay dependency and clean up expression. Order of the buildInputs was changed to match the one in setup.py.

dotlambda force-pushed the magic-wormhole branch from dbc2c3a to bc25df2 Compare February 24, 2018 09:53

dotlambda merged commit f9cb9ca into NixOS:master Feb 27, 2018

dotlambda deleted the magic-wormhole branch February 27, 2018 07:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pythonPackages.magic-wormhole: 0.10.4 -> 0.10.5 #35175

pythonPackages.magic-wormhole: 0.10.4 -> 0.10.5 #35175

dotlambda commented Feb 19, 2018

asymmetric Feb 19, 2018

dotlambda Feb 19, 2018

asymmetric Feb 19, 2018

dotlambda Feb 19, 2018

asymmetric Feb 19, 2018

dotlambda Feb 19, 2018

asymmetric Feb 19, 2018

dotlambda Feb 19, 2018

FRidh commented Feb 19, 2018

dotlambda commented Feb 19, 2018

asymmetric commented Feb 19, 2018 •

edited

dotlambda commented Feb 19, 2018

dotlambda Feb 19, 2018

asymmetric Feb 19, 2018

dotlambda Feb 19, 2018

asymmetric commented Feb 19, 2018

dotlambda commented Feb 19, 2018

GrahamcOfBorg commented Feb 19, 2018

GrahamcOfBorg commented Feb 20, 2018

dotlambda commented Feb 21, 2018

asymmetric commented Feb 21, 2018 •

edited

grahamc commented Feb 23, 2018

FRidh Feb 24, 2018

dotlambda Feb 24, 2018

dotlambda commented Feb 27, 2018

GrahamcOfBorg commented Feb 27, 2018

GrahamcOfBorg commented Feb 27, 2018

		@@ -0,0 +1,25 @@
		{ lib, buildPythonPackage, fetchPypi, twisted, mock }:

pythonPackages.magic-wormhole: 0.10.4 -> 0.10.5 #35175

pythonPackages.magic-wormhole: 0.10.4 -> 0.10.5 #35175

Conversation

dotlambda commented Feb 19, 2018

Motivation for this change

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FRidh commented Feb 19, 2018

dotlambda commented Feb 19, 2018

asymmetric commented Feb 19, 2018 • edited

dotlambda commented Feb 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

asymmetric commented Feb 19, 2018

dotlambda commented Feb 19, 2018

GrahamcOfBorg commented Feb 19, 2018

GrahamcOfBorg commented Feb 20, 2018

dotlambda commented Feb 21, 2018

asymmetric commented Feb 21, 2018 • edited

grahamc commented Feb 23, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dotlambda commented Feb 27, 2018

GrahamcOfBorg commented Feb 27, 2018

GrahamcOfBorg commented Feb 27, 2018

asymmetric commented Feb 19, 2018 •

edited

asymmetric commented Feb 21, 2018 •

edited