python3Packages.django-allauth: 0.61.1 -> 0.63.0

[gekoke]

Description of changes

Bumps version to 0.62.0

Things done

• Built on platform(s)
  • x86_64-linux

[risicle]

@ofborg build python311Packages.django-allauth

[risicle]

@ofborg build python311Packages.dj-rest-auth

Fails for me, nixos x86_64

[gekoke]

Good catch! Looks like dj-rest-auth erroneously imports from allauth.socialaccount.providers.facebook.views instead of allauth.socialaccount.providers.facebook.providers. This import worked incidentally, until some stuff got moved around just prior to django-allauth bumping its version to 0.62.0

The requirements.pip for dj-rest-auth's tests does specify django-allauth's version as ==0.61.1, so I suppose we should just wait until they bump the version to 0.62.x.

[risicle]

Suggest opening an upstream PR.

Incidentally, this is why the long-form pull request template guides you towards doing a nixpkgs-review for your PRs, so you can check you're not breaking anything.

[gekoke]

PR in progress at iMerica/dj-rest-auth#627.

Will likely close this PR in favor of django-allauth 0.62.1 if/when that's merged.

[risicle]

👍

If it takes too long (many upstream projects are in no hurry to cut new releases) you can always pull the patch via fetchpatch.

[SuperSandro2000]

Please update to 0.63.0 and also adopt the split dependencies in 0.62.0

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 8a1f6dc8ac06..3d7103e6af47 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -46,18 +46,25 @@

   propagatedBuildInputs = [
     django
-    pyjwt
-    python3-openid
-    requests
-    requests-oauthlib
-  ] ++ pyjwt.optional-dependencies.crypto;
+  ];

   passthru.optional-dependencies = {
+    mfa = [
+      qrcode
+    ];
+    openid = [
+      python3-openid
+    ];
     saml = [
       python3-saml
     ];
-    mfa = [
-      qrcode
+    socialaccount = [
+      pyjwt
+      requests
+      requests-oauthlib
+    ] ++ pyjwt.optional-dependencies.crypto;
+    steam = [
+      python3-openid
     ];
   };

[gekoke]

Done in b9d0d91

[SuperSandro2000]

PR in progress at iMerica/dj-rest-auth#627.

Will likely close this PR in favor of django-allauth 0.62.1 if/when that's merged.

We still need to fetch that patch

And django-mailman needs https://gitlab.com/mailman/django-mailman3/-/commit/f8fdbcab64892ca89a3dd27488c11258c5d893ec aka a dependency on python3-openid

[gekoke]

PR in progress at iMerica/dj-rest-auth#627.
Will likely close this PR in favor of django-allauth 0.62.1 if/when that's merged.

We still need to fetch that patch

  patches = [
    # https://github.com/iMerica/dj-rest-auth/pull/597
    (fetchpatch {
      name = "disable-email-confirmation-ratelimit-in-tests-to-support-new-allauth.patch";
      url = "https://github.com/iMerica/dj-rest-auth/commit/c8f19e18a93f4959da875f9c5cdd32f7d9363bba.patch";
      hash = "sha256-Y/YBjV+c5Gw1wMR5r/4VnyV/ewUVG0z4pjY/MB4ca9Y=";
    })
    # https://github.com/iMerica/dj-rest-auth/pull/627
    (fetchpatch {
      name = "fix-test-breakages-with-django-allauth-v0.62.1.patch";
      url = "https://patch-diff.githubusercontent.com/raw/iMerica/dj-rest-auth/pull/627.patch";
      sha256 = "sha256-UUSB/wXxWoWjSqUUxQWW0A00LLgEtoOC9He8DQ6lGOg=";
    })
  ];

These two patches conflict, as the second was based off a newer revision that already had the first.

What's the best way to proceed? Is it ok to bump that package as well?

[alyssais]

Unmerged PRs shouldn't be fetchpatched anyway, because the URLs aren't stable. So you can vendor versions of the two patches with conflicts resolved.