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

etesync-dav: 0.32.1 -> 0.32.1-unstable-2024-09-02 #338651

Merged

Conversation

ghpzin
Copy link
Contributor

@ghpzin ghpzin commented Aug 31, 2024

Diff: etesync/etesync-dav@v0.32.1...b9b23bf

Description of changes

Since radicale update to 3.2.2 (#321108) etesync-dav fails during runtime with error related to changes to log.set_level (additional second arg).

Fixes test run of nixosTests.etesync-dav (fails since 2024-06-20 - merge of radicale update):
https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.etesync-dav.x86_64-linux
https://hydra.nixos.org/build/270729013

Error log:

machine # Traceback (most recent call last):
machine #   File "/nix/store/wd2by7xjf0cx15nwdxg395x0zsfja50g-etesync-dav-0.32.1/bin/.etesync-dav-wrapped", line 164, in <module>
machine #     radicale_main.run(radicale_args + sys.argv[1:])
machine #   File "/nix/store/wd2by7xjf0cx15nwdxg395x0zsfja50g-etesync-dav-0.32.1/lib/python3.12/site-packages/etesync_dav/radicale_main/__init__.py", line 136, in run
machine #     log.set_level(configuration.get("logging", "level"))
machine # TypeError: set_level() missing 1 required positional argument: 'backtrace_on_debug'

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ghpzin
Copy link
Contributor Author

ghpzin commented Sep 2, 2024

@ofborg test etesync-dav

@ghpzin ghpzin marked this pull request as ready for review September 2, 2024 18:19
@aktaboot
Copy link
Contributor

aktaboot commented Sep 7, 2024

Maybe a better approach would be to update this package to latest upstream commit and remove patches since they have all been merged now.

I have tested that and it seems to work fine,

but maybe we have a reason to prefer fetchPypi over fetchFromGitHub I am not aware of

@ghpzin ghpzin force-pushed the etesync-dav/fix-runtime-with-radicale-3.2.2 branch from af06cde to 41b3778 Compare September 7, 2024 14:20
@ghpzin
Copy link
Contributor Author

ghpzin commented Sep 7, 2024

Removed 2 patches, converted to update to 0.32.1-unstable-2024-09-02
Looked through commits and there did not seem to be anything else that should have changed behavior other than 2 patches we already pulled.

@ghpzin ghpzin changed the title etesync-dav: fix runtime error with radicale 3.2.2 etesync-dav: 0.32.1 -> 0.32.1-unstable-2024-09-02 Sep 7, 2024
Diff: etesync/etesync-dav@v0.32.1...b9b23bf

- contains commit pulled previously pulled with fetchpatch:
https://www.github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e
- contains commit with changes to log.set_level() from radicale 3.2.2
update (additional second arg - backtrace_on_debug):
https://www.github.com/Kozea/Radicale/pull/1519
https://www.github.com/etesync/etesync-dav/pull/318
@ghpzin ghpzin force-pushed the etesync-dav/fix-runtime-with-radicale-3.2.2 branch from 41b3778 to 0dc1c72 Compare September 7, 2024 14:23
@aktaboot
Copy link
Contributor

aktaboot commented Sep 7, 2024

I tested this and it is working as expected :)

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4536

@kraftnix
Copy link
Contributor

Can also confirm this works perfectly.

@aktaboot
Copy link
Contributor

Merge! 🪄

@Artturin Artturin merged commit 13ce222 into NixOS:master Sep 13, 2024
28 of 29 checks passed
@ghpzin ghpzin deleted the etesync-dav/fix-runtime-with-radicale-3.2.2 branch September 13, 2024 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants