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

matrix-synapse: 0.34.0.1 -> 0.34.1.1 #53797

Merged
merged 3 commits into from Jan 14, 2019
Merged

matrix-synapse: 0.34.0.1 -> 0.34.1.1 #53797

merged 3 commits into from Jan 14, 2019

Conversation

nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Jan 11, 2019 •
edited

Motivation for this change

Need a pysaml2 update, I am working on it done

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.

@nyanloutre nyanloutre changed the title matrix-synapse: 0.34.0.1 -> 0.34.1.1 [WIP] matrix-synapse: 0.34.0.1 -> 0.34.1.1 Jan 11, 2019
@Ekleog
Copy link
Member

Ekleog commented Jan 11, 2019

This change appears to break the matrix-synapse NixOS test (nix-build nixos/tests/matrix-synapse.nix): ERROR:root:Needed pysaml2>=4.5.0 but it was not installed

@nyanloutre
Copy link
Member Author

@Ekleog it seems the pysaml2 package did have significant changes since last version, but the matrix test is passing and it's working for me

@nyanloutre nyanloutre changed the title [WIP] matrix-synapse: 0.34.0.1 -> 0.34.1.1 matrix-synapse: 0.34.0.1 -> 0.34.1.1 Jan 11, 2019
dotlambda
dotlambda reviewed Jan 11, 2019
View reviewed changes
pkgs/development/python-modules/pysaml2/default.nix Outdated
sed -i 's/pymongo==3.0.1/pymongo/' setup.py
'';

# 16 failed, 427 passed, 17 error in 88.85 seconds
doCheck = false;
Copy link
Member

Choose a reason for hiding this comment

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

Please try enabling them again.

Copy link
Member Author

Choose a reason for hiding this comment

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

The tests are not included in the Pypi archive, but are available in the GitHub archive

If I enable them I get this error immediately:

json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)

More logs: https://gist.github.com/nyanloutre/e6d01b47d68ea3d5f2e1e41086184303

Copy link
Member Author

Choose a reason for hiding this comment

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

It was because the setup.py test command was wrong and had to specify it.

I now get ======== 3 failed, 669 passed, 2 skipped, 37 warnings in 216.40 seconds ========

The failing tests are trying to access an external resource

dotlambda
dotlambda reviewed Jan 11, 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.

The switch to Python 3 should have been made in 35efbed.
Can you please try whether it's possible to switch now?

@nyanloutre
Copy link
Member Author

@dotlambda is it only needed to switch the python2 argument to python3 ?

If so I get a failing test:

test.test_support.TestSupport.test_get_original_stdout
===============================================================================
[FAIL]
Traceback (most recent call last):
  File "/nix/store/5di2wpc5h7faqidsikgb94rwdbwy2y3l-python3-3.7.2/lib/python3.7/unittest/case.py", line 59, in testPartExecutor
    yield
  File "/nix/store/5di2wpc5h7faqidsikgb94rwdbwy2y3l-python3-3.7.2/lib/python3.7/unittest/case.py", line 615, in run
    testMethod()
  File "/nix/store/5di2wpc5h7faqidsikgb94rwdbwy2y3l-python3-3.7.2/lib/python3.7/test/test_support.py", line 410, in test_check__all__
    blacklist=blacklist)
  File "/nix/store/5di2wpc5h7faqidsikgb94rwdbwy2y3l-python3-3.7.2/lib/python3.7/test/support/__init__.py", line 2556, in check__all__
    test_case.assertCountEqual(module.__all__, expected)
  File "/nix/store/5di2wpc5h7faqidsikgb94rwdbwy2y3l-python3-3.7.2/lib/python3.7/unittest/case.py", line 1200, in assertCountEqual
    self.fail(msg)
  File "/nix/store/5di2wpc5h7faqidsikgb94rwdbwy2y3l-python3-3.7.2/lib/python3.7/unittest/case.py", line 680, in fail
    raise self.failureException(msg)
builtins.AssertionError: Element counts were not equal:
First has 1, Second has 0:  'SkipTest'

@dotlambda
Copy link
Member

The dependency on matrix-angular-sdk seems to have been removed in matrix-org/synapse@df96177#diff-330f0c9df17ab9196f1537b1d625b6bb.

@dotlambda
Copy link
Member

@nyanloutre Actually, matrix-angular-sdk should also be removed from the let statement.
Also, we should fine some meaningful way to squash the commits into a few less.

nyanloutre and others added 3 commits January 11, 2019 16:36
@nyanloutre
pythonPackages.pysaml2: 3.0.2 -> 4.6.5
06c0898 
Also run tests and hardcode path to xmlsec1.
@nyanloutre
matrix-synapse: 0.34.0.1 -> 0.34.1.1
bc56152 
Also correctly run tests.
matrix-synapse: use python3
b720ecb
dotlambda
dotlambda approved these changes Jan 11, 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.

Someone should try this on a real-world home server with the Python 3 switch applied.

@nyanloutre
Copy link
Member Author

Thanks for the help @dotlambda

I am installing this on my server right now

@dotlambda
Copy link
Member

@nyanloutre Did it work?

@dotlambda
Copy link
Member

@GrahamcOfBorg build matrix-synapse nixosTests.matrix-synapse

@nyanloutre
Copy link
Member Author

@dotlambda yes, it's been 2 days and it's still working well

@dotlambda dotlambda merged commit 43dd721 into NixOS:master Jan 14, 2019
@nyanloutre nyanloutre deleted the matrix-synapse-upgrade branch January 14, 2019 09:24
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 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
4 participants
@nyanloutre @Ekleog @dotlambda @GrahamcOfBorg