[PATCH 0/54 v6] Update django and install wagtail.

Open

Details

One participant

Nicolas Graves

Owner: unassigned

Submitted by: Nicolas Graves

Severity: normal

Nicolas Graves wrote on 5 Sep 2023 16:48

Recipients:(address . guix-patches@gnu.org)

Message-ID:874jk8n0aa.fsf@ngraves.fr

This is a resubmit of the former issue 55474, so that it is properly
evaluated by Guix QA and accounts for a new inteferring upstream patch.

-- 
Best regards,
Nicolas Graves

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 02/55] gnu: python-asgiref: Update to 3.6.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:385e3b9f44f5477b553c37a619b581a437874c2d.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-web.scm (python-asgiref): Update to 3.6.0.

---

gnu/packages/python-web.scm | 13 +++----------

1 file changed, 3 insertions(+), 10 deletions(-)

Toggle diff (30 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93fd2d2278..fe3916864e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -548,20 +548,13 @@ (define-public python-aiostream
 (define-public python-asgiref
   (package
     (name "python-asgiref")
-    (version "3.4.1")
+    (version "3.6.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "asgiref" version))
               (sha256
-               (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest" "-vv")))))))
+               (base32 "01lmjidadid0czd32d2c21lb6q78ri0pr0i74a4qqg4dppkxyrwm"))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest python-pytest-asyncio))
     (home-page "https://github.com/django/asgiref/")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 01/55] gnu: python-django-4.0: Update to 4.0.9.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:210284f7682898dae8772280ec23f175e26255a9.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-4.0): Update to 4.0.9.

---

gnu/packages/django.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b089954b6b..41ab8576a0 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -55,13 +55,13 @@ (define-module (gnu packages django)
 (define-public python-django-4.0
   (package
     (name "python-django")
-    (version "4.0.7")
+    (version "4.0.9")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "0qblhh7s7fcznqr79919yp2d7wiz3ixv39navmifb677dg9mlvcw"))))
+                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))
     (build-system python-build-system)
     (arguments
      '(#:phases

base-commit: 8d19ff23052bffb1c43f0d39f543eb0b1e363074
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 04/55] gnu: python-distributed: Disable failing tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:e8f3995e1c2e1e8b45a931bddcfe3bb7556f0ad5.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-science.scm (python-distributed): Disable failing tests.

---

gnu/packages/python-science.scm | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 4a010b4127..ab2ceb0b2c 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -1296,7 +1296,8 @@ (define-public python-distributed
                 "test_tls_temporary_credentials_functional"
                 "test_variable_in_task"
                 "test_worker_preload_text"
-                "test_worker_uses_same_host_as_nanny")
+                "test_worker_uses_same_host_as_nanny"
+                "test_nanny_timeout") ; access to 127.0.0.1
                " and not ")
 
               ;; These fail because it doesn't find dask[distributed]
@@ -1319,7 +1320,8 @@ (define-public python-distributed
 
               ;; These tests are rather flaky
               " and not test_quiet_quit_when_cluster_leaves"
-              " and not multiple_clients_restart"))
+              " and not multiple_clients_restart"
+              " and not test_steal_twice"))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'versioneer
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 03/55] gnu: Add python-asgiref-3.4.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:a5960a5db13adbfedddfce1178dc889436671a6e.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-web.scm (python-asgiref-3.4.1): New variable.

---

gnu/packages/python-web.scm | 11 +++++++++++

1 file changed, 11 insertions(+)

Toggle diff (24 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fe3916864e..78ab265603 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -565,6 +565,17 @@ (define-public python-asgiref
 WSGI.  This package includes libraries for implementing ASGI servers.")
     (license license:bsd-3)))
 
+(define-public python-asgiref-3.4.1
+  (package
+    (inherit python-asgiref)
+    (version "3.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "asgiref" version))
+       (sha256
+        (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))))
+
 (define-public python-asgi-csrf
   (package
     (name "python-asgi-csrf")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 05/55] gnu: Add python-django-4.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:beae415f2bb75f0faaf8e678cae6818bd2332416.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-4.2): New variable.

---

gnu/packages/django.scm | 18 +++++++++++++++---

1 file changed, 15 insertions(+), 3 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 41ab8576a0..72127bbd34 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -52,16 +52,16 @@ (define-module (gnu packages django)
   #:use-module (gnu packages time)
   #:use-module (gnu packages xml))
 
-(define-public python-django-4.0
+(define-public python-django-4.2
   (package
     (name "python-django")
-    (version "4.0.9")
+    (version "4.2.2")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))
+                "1pxs4i1p55k56i8nsr9a1firgsp2pqcv1g0hxxxx17dmynznysra"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -139,6 +139,18 @@ (define-public python-django-4.0
     (license license:bsd-3)
     (properties `((cpe-name . "django")))))
 
+(define-public python-django-4.0
+  (package
+    (inherit python-django-4.2)
+    (name "python-django")
+    (version "4.0.9")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "Django" version))
+              (sha256
+               (base32
+                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))))
+
 (define-public python-django-3.2
   (package
     (inherit python-django-4.0)
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 06/55] gnu: python-django-extensions: Update to 3.2.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:e38a7482c597893d27fae1b2a56fd17a432d38ec.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-extensions): Update to 3.2.0.
[source]: Add snippet to disable pip-dependent tests. Update to 3.2.0.
[build-system]: Use pyproject-build-system.
[arguments]: Enable tests.
[native-inputs]: Add python-pygments and tzdata-for-tests.
---
 gnu/packages/django.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 72127bbd34..f56d0f6565 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -204,7 +204,7 @@ (define-public python-django python-django-3.2)
 (define-public python-django-extensions
   (package
     (name "python-django-extensions")
-    (version "3.0.6")
+    (version "3.2.0")
     (source
      (origin
        (method git-fetch)
@@ -214,11 +214,11 @@ (define-public python-django-extensions
              (commit version)))
        (file-name (string-append name "-" version))
        (sha256
-        (base32
-         "0sra6hazqvspxd1pnx5cj7gia1rkaz3hn06ib4wd0frc167f5afy"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:tests? #f)) ;XXX: requires a Postgres or MySQL database
+        (base32 "1wfzlfjbicvk093xqx3qw633ap2khk6kc1ph2kwfk72wxy8yq9lf"))
+       (snippet ; Disable pip-dependent tests.
+        '(delete-file "tests/management/commands/test_pipchecker.py"))))
+    (build-system pyproject-build-system)
+    ;; TODO More tests can be enabled with a Postgres or MySQL database
     (propagated-inputs
      (list python-six python-vobject python-werkzeug python-dateutil
            python-django))
@@ -226,10 +226,12 @@ (define-public python-django-extensions
      (list python-mock
            python-factory-boy
            python-tox
+           python-pygments
            python-pytest
            python-pytest-cov
            python-pytest-django
-           python-shortuuid))
+           python-shortuuid
+           tzdata-for-tests))
     (home-page
      "https://github.com/django-extensions/django-extensions")
     (synopsis "Custom management extensions for Django")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 07/55] gnu: Add python-django-extensions-3.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:166f245dc914cbfa89880ffc14df6d0258d3068a.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-extensions-3.0): New variable.
---
 gnu/packages/django.scm | 21 +++++++++++++++++++++
 gnu/packages/web.scm    |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

Toggle diff (47 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f56d0f6565..6845872ec7 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -240,6 +240,27 @@ (define-public python-django-extensions
 commands, additional database fields and admin extensions.")
     (license license:expat)))
 
+(define-public python-django-extensions-3.0
+  (package
+    (inherit python-django-extensions)
+    (name "python-django-extensions")
+    (version "3.0.6")
+    (source
+     (origin
+       (method git-fetch)
+       ;; Fetch from the git repository, so that the tests can be run.
+       (uri (git-reference
+             (url "https://github.com/django-extensions/django-extensions")
+             (commit version)))
+       (file-name (string-append name "-" version))
+       (sha256
+        (base32 "0sra6hazqvspxd1pnx5cj7gia1rkaz3hn06ib4wd0frc167f5afy"))))
+    (arguments
+     '(#:tests? #f)) ;XXX: requires a Postgres or MySQL database
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs python-django-extensions)
+       (replace "python-django" python-django-3.1.14)))))
+
 (define-public python-django-localflavor
   (package
     (name "python-django-localflavor")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 46a60b8b15..3de24cbf41 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8889,7 +8889,7 @@ (define-public archivebox
            python-croniter
            python-crontab
            python-dateparser
-           python-django-extensions
+           python-django-extensions-3.0
            python-django-3.1.14
            python-mypy-extensions))
     (native-inputs
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 08/55] gnu: python-django-3.1.14: Skip failing tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:2589c25b33cfd5e42ef1facaa5cda92ef0942356.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-3.1.14): Skip failing tests..
[propagated-inputs]: Replace python-agriref by python-asgiref-3.4.1.
---
 gnu/packages/django.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

Toggle diff (55 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 6845872ec7..84f18fc3d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages django)
   #:use-module (guix gexp)
   #:use-module (guix build-system python)
   #:use-module (guix deprecation)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
@@ -178,10 +179,39 @@ (define-public python-django-3.1.14
               (sha256
                (base32
                 "0ix3v2wlnplv78zxjrlw8z3hiap2d5mxvk0ny2fc65526shsb93j"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments python-django-3.2)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'skip-failing-tests
+              (lambda _
+                (substitute* "tests/inspectdb/tests.py"
+                  (("import mock, skipUnless")
+                   "import mock, skipUnless, skipIf")
+                  (("@skipUnless\\(connection\\.vendor == 'sqlite',")
+                   "@skipIf(True, "))
+                (substitute* "tests/fixtures/tests.py"
+                  (("import mock")
+                   "import mock, skipIf")
+                  (("(def test_dumpdata_proxy_with_concrete\\(self\\):)"
+                    content all)
+                   (string-append
+                    "@skipIf(True, \""
+                    "A warning isn't displayed if a proxy model is dumped with "
+                    "its concrete parent."
+                    "\")\n    " content)))
+                (substitute* "tests/httpwrappers/tests.py"
+                  (("(def test_memoryview_content\\(self\\):)"
+                    content all)
+                   (string-append
+                    "@unittest.skipIf(True, 'Bad assertion')\n    "
+                    content)))))))))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs python-django-3.2)
        ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
-       (append python-pytz)))))
+       (append python-pytz)
+       (delete "python-asgiref")
+       (append python-asgiref-3.4.1)))))
 
 (define-public python-django-2.2
   (package
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 09/55] gnu: python-django-simple-math-captcha: Update to 1.0.9-0-61adb4f.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:9505dcf7221a378aa30ce4a41d3f1c411a000b06.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-simple-math-captcha): Update to 1.0.9-0-61adb4f.
[build-system]: Use pyproject-build-system.
[arguments](phases): Delete phase patch-six-imports.
[propagated-inputs]: Delete python-six.
---
 gnu/packages/django.scm | 66 +++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

Toggle diff (81 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 84f18fc3d1..e2754b2d57 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -324,44 +324,38 @@ (define-public python-django-localflavor
     (license license:bsd-3)))
 
 (define-public python-django-simple-math-captcha
-  (package
-    (name "python-django-simple-math-captcha")
-    (version "1.0.9")
-    (home-page "https://github.com/alsoicode/django-simple-math-captcha")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fhy9k8haqa1296v0qpg1b5w7y3pyw9qi9z9laj5ijry1gk35qaw"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'patch-six-imports
-                    (lambda _
-                      ;; Django no longer bundles six, adjust the imports
-                      ;; accordingly.  The six dependency can likely be
-                      ;; removed in the next version.
-                      (substitute* (find-files "." "\\.py$")
-                        (("from django\\.utils import six")
-                         "import six"))
-                      #t))
-                  (replace 'check
-                    (lambda _
-                      (invoke "python" "runtests.py"))))))
-    (native-inputs
-     (list python-mock))
-    (propagated-inputs
-     (list python-django python-six))
-    (synopsis "Easy-to-use math field/widget captcha for Django forms")
-    (description
-     "A multi-value-field that presents a human answerable question,
+  (let ((commit "61adb4f43bfc654da61fa7b84ea4f455e31f0bd2")
+        (revision "0"))
+    (package
+      (name "python-django-simple-math-captcha")
+      (version (git-version "1.0.9" revision commit))
+      (home-page "https://github.com/alsoicode/django-simple-math-captcha")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url home-page)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "02fim6xk4islil02xg7j5nqfpmgwzyqni1y17a082fz35d94jd3i"))))
+      (build-system pyproject-build-system)
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (replace 'check
+             (lambda _
+               (invoke "python" "runtests.py"))))))
+      (native-inputs
+       (list python-mock))
+      (propagated-inputs
+       (list python-django))
+      (synopsis "Easy-to-use math field/widget captcha for Django forms")
+      (description
+       "A multi-value-field that presents a human answerable question,
 with no settings.py configuration necessary, but instead can be configured
 with arguments to the field constructor.")
-    (license license:asl2.0)))
+      (license license:asl2.0))))
 
 (define-public python-django-classy-tags
   (package
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 10/55] gnu: python-easy-thumbnails: Update to 2.8.5.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:ea079e49434ec40028138d9e281940e866684b87.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-easy-thumbnails): Update to 2.8.5.
[arguments]: Replace check phase.
---
 gnu/packages/django.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index e2754b2d57..730a684342 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -415,15 +415,21 @@ (define-public python-django-taggit
 (define-public python-easy-thumbnails
   (package
     (name "python-easy-thumbnails")
-    (version "2.7")
+    (version "2.8.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "easy-thumbnails" version))
        (sha256
-        (base32
-         "14gzp5cv24z0qhxb7f7k7v9jgzpaj4n8yhjq83ynpx8183fs1rz4"))))
-    (build-system python-build-system)
+        (base32 "0dayfvfx9pr0d4pajrv2ji7rrpsxq5z5bxpyl6rn16zw14k92kky"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda _
+                   (invoke "python" "-m" "django" "test"
+                           "--settings" "easy_thumbnails.tests.settings"))))))
     (propagated-inputs
      (list python-django python-pillow))
     (home-page "https://github.com/SmileyChris/easy-thumbnails")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 11/55] gnu: python-django-filter: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:233b3da3f93a8795fec0a354cf4526e6a4cee26f.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-filter): Add native-input tzdata-for-tests.

---

gnu/packages/django.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 730a684342..1458bc133a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -550,7 +550,8 @@ (define-public python-django-filter
              (invoke "python" "runtests.py"))))))
     (native-inputs
      (list python-django python-django-rest-framework
-           python-django-crispy-forms python-mock))
+           python-django-crispy-forms python-mock
+           tzdata-for-tests))
     (home-page "https://django-filter.readthedocs.io/en/latest/")
     (synopsis "Reusable Django application to filter querysets dynamically")
     (description
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 12/55] gnu: python-django-allauth: Update to 0.47.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:eebf929fc4ac8426900c74511c9ca1e64e99771e.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-allauth): Update to 0.47.0.
[build-system]: Use pyproject-build-system.
[arguments](phases): Set the django settings module as argument.
---
 gnu/packages/django.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Toggle diff (34 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 1458bc133a..e4cc877660 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -564,23 +564,22 @@ (define-public python-django-filter
 (define-public python-django-allauth
   (package
     (name "python-django-allauth")
-    (version "0.42.0")
+    (version "0.47.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-allauth" version))
        (sha256
         (base32
-         "0c0x8izvrnjhrr48w6pwsfk9ddbi6yfxg7v3hh5dm1vz1d0hjwpi"))))
-    (build-system python-build-system)
+         "1s65syhq466qvd3qj7xpcv02m623srazb0yjh44n4wp6qva0kkrb"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
            (lambda _
-             (setenv "DJANGO_SETTINGS_MODULE" "test_settings")
              (invoke "django-admin" "test" "allauth.tests"
-                     "--pythonpath=."))))))
+                     "--pythonpath=." "--settings=test_settings"))))))
     (propagated-inputs
      (list python-openid python-requests python-requests-oauthlib))
     (native-inputs
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 13/55] gnu: python-django-debug-toolbar: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:d538eb77845089ebb372bec03829da690ce72518.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-debug-toolbar): Add native-input tzdata-for-tests.

---

gnu/packages/django.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index e4cc877660..fae6bc041d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -612,7 +612,7 @@ (define-public python-django-debug-toolbar
     (propagated-inputs
      (list python-sqlparse python-django))
     (native-inputs
-     (list python-django-jinja python-html5lib))
+     (list python-django-jinja python-html5lib tzdata-for-tests))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 14/55] gnu: python-django-picklefield: Update to 3.1.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:046401fd35b9a4eb1c04218a04f527c8a042bed7.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-picklefield): Update to 3.1.0.
[build-system] Use pyproject-build-system.
[arguments](phases): Delete -v2 django@2.2 flag.
[propagated-inputs] Replace python-django@2.2 by python-django.
---
 gnu/packages/django.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index fae6bc041d..2af94a3297 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -760,7 +760,7 @@ (define-public python-dj-database-url
 (define-public python-django-picklefield
   (package
     (name "python-django-picklefield")
-    (version "3.0.1")
+    (version "3.1.0")
     (home-page "https://github.com/gintas/django-picklefield")
     ;; Use a git checkout because the PyPI release lacks tests.
     (source
@@ -771,19 +771,16 @@ (define-public python-django-picklefield
               (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-         (base32
-          "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk"))))
-    (build-system python-build-system)
+         (base32 "00d8sm6cnkv5bxbs2a3qrm4g69nlaa1wari7mc697df8q91v6r0n"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
                   (replace 'check
                     (lambda _
-                      (invoke "python" "-m" "django" "test" "-v2"
+                      (invoke "python" "-m" "django" "test"
                               "--settings=tests.settings"))))))
     (propagated-inputs
-     ;; XXX: Picklefield has not been updated in 10+ years and fails tests
-     ;; with Django 3.2.
-     `(("python-django@2.2" ,python-django-2.2)))
+     (list python-django))
     (synopsis "Pickled object field for Django")
     (description "Pickled object field for Django")
     (license license:expat)))
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 15/55] gnu: Remove python-django-2.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:ddd15be29c6fb1728ad4a417ddaa51f9fe290350.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-2.2): Delete variable.

---

gnu/packages/django.scm | 15 ---------------

1 file changed, 15 deletions(-)

Toggle diff (28 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 2af94a3297..46781e539a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -213,21 +213,6 @@ (define-public python-django-3.1.14
        (delete "python-asgiref")
        (append python-asgiref-3.4.1)))))
 
-(define-public python-django-2.2
-  (package
-    (inherit python-django-3.2)
-    (version "2.2.28")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "Django" version))
-              (sha256
-               (base32
-                "04vl7aivsshzsnn547lm4jdinr67afhdspc40f0c06xzmxbvc002"))))
-    (native-inputs
-     (modify-inputs (package-native-inputs python-django-3.2)
-       (prepend ;; 2.2 requires Selenium for the test suite.
-                python-selenium)))))
-
 ;; Use 3.2 LTS as the default until packages gain support for 4.x.
 (define-public python-django python-django-3.2)
 
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 16/55] gnu: datasette: Disabling failing tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:572cb93ba594a4fddbaac1d4ee6127425ec069a5.1693931491.git.ngraves@ngraves.fr

* gnu/packages/databases.scm (datasette): Disabling failing tests.

---

gnu/packages/databases.scm | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (17 lines)diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 3d41649f4d..6cfe63c18e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5159,7 +5159,9 @@ (define-public datasette
                     " or test_table_with_slashes_in_name"
                     " or test_searchable"
                     " or test_custom_query_with_unicode_characters"
-                    " or test_searchmode)")
+                    " or test_searchmode"
+                    " or test_max_csv_mb" ;URL too long
+                    " or test_database_page)") ; assert async_hook -> hook
               "-n" (number->string (parallel-job-count))
               "-m" "not serial")        ;cannot run in parallel
       #:phases
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 17/55] gnu: graphite-web: Update to 1.1.10-0-dca59dc.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:a10e53db4fe3cb201d135664fed6ccd0e15c8b90.1693931491.git.ngraves@ngraves.fr

* gnu/packages/monitoring.scm (graphite-web): Update to 1.1.10-0-dca59dc.
[build-system]: Use pyproject-build-system.
[arguments](tests?): Enable tests.
(phases): Remove trailing #t.
[propagated-inputs]: Move from python-django-2.2 to python-django-3.2.
---
 gnu/packages/monitoring.scm | 79 +++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

Toggle diff (94 lines)diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 3238f11fb4..45c8665602 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -452,47 +452,48 @@ (define-public python-carbon
     (license license:asl2.0)))
 
 (define-public graphite-web
-  (package
-    (name "graphite-web")
-    (version "1.1.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "graphite-web" version))
-       (sha256
-        (base32
-         "1l5a5rry9cakqxamvlx4xq63jifmncb6815bg9vy7fg1zyd3pjxk"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:tests? #f               ;XXX: not in PyPI release & requires database
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'relax-requirements
-           (lambda _
-             (substitute* "setup.py"
-               ;; Allow newer versions of django-tagging.
-               (("django-tagging==")
-                "django-tagging>="))
-             #t))
-         ;; Don't install to /opt
-         (add-after 'unpack 'do-not-install-to-/opt
-           (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1") #t)))))
-    (propagated-inputs
-     (list python-cairocffi
-           python-pytz
-           python-whisper
-           python-django-2.2
-           python-django-tagging
-           python-scandir
-           python-urllib3
-           python-pyparsing
-           python-txamqp))
-    (home-page "https://graphiteapp.org/")
-    (synopsis "Scalable realtime graphing system")
-    (description "Graphite is a scalable real-time graphing system that does
+  (let ((commit "dca59dc72ae28ffdae659232c10c60aa598536eb")
+        (revision "0"))
+    (package
+      (name "graphite-web")
+      (version "1.1.10")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/graphite-project/graphite-web")
+               (commit commit)))
+         (sha256
+          (base32 "06yzvg2r9lx92swp51k27qhxf178nq6y9px5kcmpv31ikc3nri7q"))))
+      (build-system pyproject-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'relax-requirements
+             (lambda _
+               (substitute* "setup.py"
+                 ;; Allow newer versions of django-tagging.
+                 (("django-tagging==")
+                  "django-tagging>="))))
+           ;; Don't install to /opt
+           (add-after 'unpack 'do-not-install-to-/opt
+             (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1"))))))
+      (propagated-inputs
+       (list python-cairocffi
+             python-pytz
+             python-whisper
+             python-django-3.2
+             python-django-tagging
+             python-scandir
+             python-urllib3
+             python-pyparsing
+             python-txamqp))
+      (home-page "https://graphiteapp.org/")
+      (synopsis "Scalable realtime graphing system")
+      (description "Graphite is a scalable real-time graphing system that does
 two things: store numeric time-series data, and render graphs of this data on
 demand.")
-    (license license:asl2.0)))
+      (license license:asl2.0))))
 
 (define-public python-prometheus-client
   (package
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 18/55] gnu: python-django-contact-form: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:ce29e53acc81804e0eee87b54410cb9c2fe6af01.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-contact-form): Add native-input tzdata-for-tests.
[build-system]: Use pyproject-build-system.
---
 gnu/packages/django.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 46781e539a..35a7ad2f02 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -803,7 +803,7 @@ (define-public python-django-contact-form
               (sha256
                (base32
                 "1my9hkrylckp5vfqg9b0kncrdlxjnwxll56sdciqn4v19i4wbq1y"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -812,7 +812,7 @@ (define-public python-django-contact-form
              (invoke "coverage" "run" "--source" "contact_form"
                      "runtests.py"))))))
     (native-inputs
-     (list python-coverage))
+     (list python-coverage tzdata-for-tests))
     (propagated-inputs
      (list python-django))
     (home-page "https://github.com/ubernostrum/django-contact-form")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 20/55] gnu: python-dango-rq: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:e62f24bb615d89c84eb601af8f2b197bf3f3cb6d.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-dango-rq): Add native-input tzdata-for-tests.
[build-system]: Use pyproject-builds-system.
---
 gnu/packages/django.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (25 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 9df73667af..4db0f22e51 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -926,7 +926,7 @@ (define-public python-django-rq
               (sha256
                (base32
                 "0aw0fi0lg80qgdp9fhjbnlhvfh2p09rgy1nj6hxpyhi37kihni2h"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -937,7 +937,8 @@ (define-public python-django-rq
                      "--settings=django_rq.tests.settings"
                      "--pythonpath=."))))))
     (native-inputs
-     (list python-django-redis python-mock python-rq-scheduler redis))
+     (list python-django-redis python-mock python-rq-scheduler redis
+           tzdata-for-tests))
     (propagated-inputs
      (list python-django python-rq))
     (home-page "https://github.com/ui/django-rq")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 19/55] gnu: python-django-contrib-comments: Update to 2.2.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:06481dc81970e3077f60a109037f548740c96e0b.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-contrib-comments): Update to 2.2.0.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add tzdata-for-tests.
[propagated-inputs]: Remove python-six.
---
 gnu/packages/django.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 35a7ad2f02..9df73667af 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -825,16 +825,18 @@ (define-public python-django-contact-form
 (define-public python-django-contrib-comments
   (package
     (name "python-django-contrib-comments")
-    (version "1.9.2")
+    (version "2.2.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-contrib-comments" version))
               (sha256
                (base32
-                "0ccdiv784a5vnpfal36km4dyg12340rwhpr0riyy0k89wfnjn8yi"))))
-    (build-system python-build-system)
+                "1njnfcmlg70icin160jpk8f3kr00drfj1zxf2si1dq3pavqh1pj8"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list tzdata-for-tests))
     (propagated-inputs
-     (list python-django python-six))
+     (list python-django))
     (home-page "https://github.com/django/django-contrib-comments")
     (synopsis "Comments framework")
     (description
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 21/55] gnu: python-django-sortedm2m: Replace input python-django by python-django-3.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:f6b56e23d3c1887e763ebf0920d22143ea0ad4c1.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-sortedm2m): Replace input python-django by python-django-3.2.

---

gnu/packages/django.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4db0f22e51..c689526a6d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -991,7 +991,7 @@ (define-public python-django-sortedm2m
                               "test" "--settings=test_project.settings"
                               "--pythonpath=."))))))
     (propagated-inputs
-     (list python-django))
+     (list python-django-3.2))
     (home-page "https://github.com/jazzband/django-sortedm2m")
     (synopsis "Drop-in replacement for django's own ManyToManyField")
     (description
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 22/55] gnu: python-django-tagging: Add patch for django@4 support.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:ba25a1cebdd908a6e921e8850c7eb1d81e78598f.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-tagging): Add patch for django@4 support.
[source](patches): Add patch for django@4 support.
[native-inputs]: Add tzdata-for-tests.
* gnu/packages/patches/python-django-tagging-django-4-support.patch
---
 gnu/packages/django.scm                       |   7 +-
 ...thon-django-tagging-django-4-support.patch | 101 ++++++++++++++++++
 2 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/python-django-tagging-django-4-support.patch

Toggle diff (134 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index c689526a6d..b5830234b4 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1071,8 +1071,9 @@ (define-public python-django-tagging
        (method url-fetch)
        (uri (pypi-uri "django-tagging" version))
        (sha256
-        (base32
-         "13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8"))))
+        (base32 "13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8"))
+       (patches
+        (search-patches "python-django-tagging-django-4-support.patch"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -1081,6 +1082,8 @@ (define-public python-django-tagging
            (lambda _
              (setenv "DJANGO_SETTINGS_MODULE" "tagging.tests.settings")
              (invoke "django-admin" "test" "--pythonpath=."))))))
+    (native-inputs
+     (list tzdata-for-tests))
     (inputs
      (list python-django))
     (home-page "https://github.com/Fantomas42/django-tagging")
diff --git a/gnu/packages/patches/python-django-tagging-django-4-support.patch b/gnu/packages/patches/python-django-tagging-django-4-support.patch
new file mode 100644
index 0000000000..bb51f072cf
--- /dev/null
+++ b/gnu/packages/patches/python-django-tagging-django-4-support.patch
@@ -0,0 +1,101 @@
+From ee42fd962c5abc7ed18f729ded42ee1f56397678 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado@kiwi.com>
+Date: Sun, 12 Dec 2021 18:13:23 +0100
+Subject: [PATCH 2/4] Use smart_str instead of deprecated smart_text Django
+ function
+
+---
+ tagging/models.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tagging/models.py b/tagging/models.py
+index 02550eec..d16a61ec 100644
+--- a/tagging/models.py
++++ b/tagging/models.py
+@@ -5,7 +5,7 @@
+ from django.contrib.contenttypes.models import ContentType
+ from django.db import connection
+ from django.db import models
+-from django.utils.encoding import smart_text
++from django.utils.encoding import smart_str
+ from django.utils.translation import gettext_lazy as _
+ 
+ from tagging import settings
+@@ -519,4 +519,4 @@ class Meta:
+         verbose_name_plural = _('tagged items')
+ 
+     def __str__(self):
+-        return '%s [%s]' % (smart_text(self.object), smart_text(self.tag))
++        return '%s [%s]' % (smart_str(self.object), smart_str(self.tag))
+
+From 9c47683ec67ad2fbf82f1dce6384b156f64f55bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado@kiwi.com>
+Date: Sun, 12 Dec 2021 18:14:35 +0100
+Subject: [PATCH 3/4] Use re_path instead of deprecated url Django function
+
+---
+ tagging/tests/urls.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tagging/tests/urls.py b/tagging/tests/urls.py
+index aa127d5f..7db3e7e1 100644
+--- a/tagging/tests/urls.py
++++ b/tagging/tests/urls.py
+@@ -1,5 +1,5 @@
+ """Test urls for tagging."""
+-from django.conf.urls import url
++from django.urls import re_path
+ 
+ from tagging.tests.models import Article
+ from tagging.views import TaggedObjectList
+@@ -11,10 +11,10 @@ class StaticTaggedObjectList(TaggedObjectList):
+ 
+ 
+ urlpatterns = [
+-    url(r'^static/$', StaticTaggedObjectList.as_view()),
+-    url(r'^static/related/$', StaticTaggedObjectList.as_view(
++    re_path(r'^static/$', StaticTaggedObjectList.as_view()),
++    re_path(r'^static/related/$', StaticTaggedObjectList.as_view(
+         related_tags=True)),
+-    url(r'^no-tag/$', TaggedObjectList.as_view(model=Article)),
+-    url(r'^no-query-no-model/$', TaggedObjectList.as_view()),
+-    url(r'^(?P<tag>[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)),
++    re_path(r'^no-tag/$', TaggedObjectList.as_view(model=Article)),
++    re_path(r'^no-query-no-model/$', TaggedObjectList.as_view()),
++    re_path(r'^(?P<tag>[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)),
+ ]
+
+From 6550f6c04c0d2d67049e8cc3263623811207c66d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado@kiwi.com>
+Date: Sun, 12 Dec 2021 18:26:03 +0100
+Subject: [PATCH 4/4] Add support for Django 4 compatibility
+
+---
+ tagging/models.py | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/tagging/models.py
++++ b/tagging/models.py
+@@ -5,6 +5,7 @@
+ from django.contrib.contenttypes.models import ContentType
+ from django.db import connection
+ from django.db import models
++from django.db.models.query_utils import Q
+ from django.utils.encoding import smart_str
+ from django.utils.translation import gettext_lazy as _
+ 
+@@ -155,8 +156,9 @@ def usage_for_model(self, model, counts=False, min_count=None,
+             filters = {}
+ 
+         queryset = model._default_manager.filter()
+-        for f in filters.items():
+-            queryset.query.add_filter(f)
++        for k, v in filters.items():
++            # Add support for both Django 4 and inferior versions
++            queryset.query.add_q(Q((k, v)))
+         usage = self.usage_for_queryset(queryset, counts, min_count)
+ 
+         return usage
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:30

[PATCH v6 23/55] gnu: python-django-sortedm2m: Update to 3.1.1-0-ddf321f.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:4120947a594f8b1b14f375dcc02f1d40e8fa777e.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-sortedm2m): Update to 3.1.1-0-ddf321f.
[build-system]: Use pyproject-build-system.
[arguments](tests?): Disable tests.
(phases): Execute phase 'check command when tests?.
[native-inputs]: Add python-psycopg2.
---
 gnu/packages/django.scm | 57 ++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 24 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b5830234b4..a741eb64a0 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -973,32 +973,41 @@ (define-public python-django-q
     (license license:expat)))
 
 (define-public python-django-sortedm2m
-  (package
-    (name "python-django-sortedm2m")
-    (version "3.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "django-sortedm2m" version))
-              (sha256
-               (base32
-                "0z0yymmrr2l5cznqbzwziw624df0qsiflvbpqwrpan52nww3dk4a"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (invoke "django-admin"
-                              "test" "--settings=test_project.settings"
-                              "--pythonpath=."))))))
-    (propagated-inputs
-     (list python-django-3.2))
-    (home-page "https://github.com/jazzband/django-sortedm2m")
-    (synopsis "Drop-in replacement for django's own ManyToManyField")
-    (description
-      "Sortedm2m is a drop-in replacement for django's own ManyToManyField.
+  (let ((commit "ddf321fc9736b9a9477d496c60250270111cf2ce")
+        (revision "0"))
+    (package
+      (name "python-django-sortedm2m")
+      (version (git-version "3.1.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/jazzband/django-sortedm2m")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1j08xyvlc5dypd26p48v0dj3k5g5ssrygvdy8zgg64g3iw8sw7v3"))))
+      (build-system pyproject-build-system)
+      (arguments
+       `(#:tests? #f ; require a running postgresql server
+         #:phases
+         (modify-phases %standard-phases
+           (replace 'check
+             (lambda* (#:key tests? #:allow-other-keys)
+               (when tests?
+                 (invoke "django-admin"
+                         "test" "--settings=test_project.settings"
+                         "--pythonpath=.")))))))
+      (native-inputs
+       (list python-psycopg2))
+      (propagated-inputs
+       (list python-django))
+      (home-page "https://github.com/jazzband/django-sortedm2m")
+      (synopsis "Drop-in replacement for django's own ManyToManyField")
+      (description
+       "Sortedm2m is a drop-in replacement for django's own ManyToManyField.
 The provided SortedManyToManyField behaves like the original one but remembers
 the order of added relations.")
-    (license license:bsd-3)))
+      (license license:bsd-3))))
 
 (define-public python-django-appconf
   (package
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 24/55] gnu: python-defusedxml: Update to 0.7.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:cd0444b01726d0085abe58b6d2da0df04a5eef3e.1693931491.git.ngraves@ngraves.fr

* gnu/packages/xml.scm (python-defusedxml): Update to 0.7.0.

---

gnu/packages/xml.scm | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 01e48fda57..5baa48d0ff 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1441,14 +1441,13 @@ (define-public xlsx2csv
 (define-public python-defusedxml
   (package
     (name "python-defusedxml")
-    (version "0.6.0")
+    (version "0.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "defusedxml" version))
        (sha256
-        (base32
-         "1xbp8fivl3wlbyg2jrvs4lalaqv1xp9a9f29p75wdx2s2d6h717n"))))
+        (base32 "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6"))))
     (build-system python-build-system)
     (home-page "https://bitbucket.org/tiran/defusedxml")
     (synopsis "XML bomb protection for Python stdlib modules")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 25/55] gnu: python-filetype: Update to 1.0.10.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:010ef1aa11c40e2b2f3f62862d3c046e72881283.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-filetype): Update to 1.0.10.

---

gnu/packages/python-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a950de3b46..138ce97fc7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14125,13 +14125,13 @@ (define-public python-get-version
 (define-public python-filetype
   (package
     (name "python-filetype")
-    (version "1.0.8")
+    (version "1.0.10")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "filetype" version))
        (sha256
-        (base32 "05mkinkcn36v1cnb5hzay3zxmv7jmmflckxxp08rgzbkkf3i9pvp"))))
+        (base32 "0dz9kafvd2lnzl7vd40ylzxnv9g9ph5r7hrv4mdcddii0x816fij"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 27/55] gnu: python-rjsmin: Update to 1.2.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:6141eb42c8df7294122165511e469368dcfbd0a9.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-rjsmin): Update to 1.2.1.
[source](snippet): Remove trailing #t.
[build-system]: Use pyproject-build-sytem.
[description]: Fix spacing.
[arguments]: Delete #:phases and #:tests?.
---
 gnu/packages/python-xyz.scm | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

Toggle diff (52 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 847e3bcc3b..c1237725b3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20935,38 +20935,26 @@ (define-public python-rcssmin
 (define-public python-rjsmin
   (package
     (name "python-rjsmin")
-    (version "1.1.0")
+    (version "1.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "rjsmin" version))
         (sha256
-         (base32
-          "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi"))
+         (base32 "04almyw2b5r9xq9961qgzhskjjhk82djf1s3m5vqfhqiw3l2p60z"))
         (modules '((guix build utils)))
         (snippet
          '(begin
-            (for-each delete-file (find-files "bench" "\\.js$"))
-            #t))))
-    (build-system python-build-system)
-    (arguments
-     '(#:tests? #f  ; Not all test files included.
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (if tests?
-               (invoke "py.test" "-vv" "tests")
-               #t))))))
+            (for-each delete-file (find-files "bench" "\\.js$"))))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest))
     (home-page "http://opensource.perlig.de/rjsmin/")
     (synopsis "Javascript Minifier")
     (description "@code{rJSmin} is a javascript minifier written in Python.  The
-     minifier is based on the semantics of jsmin.c by Douglas Crockford.  The module
-     is a re-implementation aiming for speed, so it can be used at runtime (rather
-                                                                            than during a preprocessing step).")
+minifier is based on the semantics of jsmin.c by Douglas Crockford.  The module
+is a re-implementation aiming for speed, so it can be used at runtime (rather
+than during a preprocessing step).")
     (license license:asl2.0)))
 
 (define-public python-xopen
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 26/55] gnu: python-rcssmin: Update to 1.1.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:326b625c71de57eb844e0a963373c3341a77aa3c.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-rcssmin): Update to 1.1.1.
[build-system]: Use pyproject-build-system.
[arguments]: Delete #:phases.
[native-inputs]: Add python-pytest.
---
 gnu/packages/python-xyz.scm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 138ce97fc7..847e3bcc3b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20916,21 +20916,16 @@ (define-public python-csscompressor
 (define-public python-rcssmin
   (package
     (name "python-rcssmin")
-    (version "1.0.6")
+    (version "1.1.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "rcssmin" version))
-        (sha256
-         (base32
-          "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _
-             (invoke "python" "run_tests.py" "tests"))))))
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "rcssmin" version))
+       (sha256
+        (base32 "0r6w2g26m7sy25rhqx2rda737a5g962yfn3g8kszaabd6ss0152g"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest))
     (home-page "http://opensource.perlig.de/rcssmin/")
     (synopsis "CSS Minifier")
     (description "The minifier is based on the semantics of the YUI compressor,
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 28/55] gnu: python-django-mailman3: Update to 1.3.8.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:85596b12f9766c934128224421523681dcbf2e04.1693931491.git.ngraves@ngraves.fr

* gnu/packages/mail.scm (python-django-mailman3): Update to 1.3.8.
[build-system]: Use pyproject-build-system.
[arguments](phases): Set DJANGO_SETTINGS_MODULE in the invoke call.
[native-inputs]: Add tzdata-for-tests.
---
 gnu/packages/mail.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 216e711856..d3c3c8fd0b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3560,29 +3560,28 @@ (define-public mlmmj
 (define-public python-django-mailman3
   (package
     (name "python-django-mailman3")
-    (version "1.3.7")
+    (version "1.3.8")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "django-mailman3" version))
         (sha256
-         (base32
-          "1dzycnwdr1gavs1dgmcv1lz24x0fkp8y864fy52fgbz72d6c5a3f"))))
-    (build-system python-build-system)
+         (base32 "0ma4q6ffyz2qhlg3cw0kbxsvwli41154p1zgv5h93l3r0s4p4xhb"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
-             (setenv "DJANGO_SETTINGS_MODULE"
-                     "django_mailman3.tests.settings_test")
-             (invoke "django-admin" "test"
-                     "--pythonpath=."))))))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "django-admin" "test"
+                     "--settings=django_mailman3.tests.settings_test"
+                     "--pythonpath=.")))))))
     (propagated-inputs
      (list python-django python-django-allauth python-django-gravatar2
            python-mailmanclient python-pytz))
     (native-inputs
-     (list python-mock))
+     (list python-mock tzdata-for-tests))
     (home-page "https://gitlab.com/mailman/django-mailman3")
     (synopsis "Django library to help interaction with Mailman")
     (description
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 29/55] gnu: Remove python-pysolr.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:28d280e69e271bd32253295d71aadcbaaebdbf29.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-web.scm (python-pysolr): Delete variable.

---

gnu/packages/python-web.scm | 25 -------------------------

1 file changed, 25 deletions(-)

Toggle diff (38 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 78ab265603..c073793544 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6737,31 +6737,6 @@ (define-public python-robot-detection
 @url{http://www.robotstxt.org}.")
     (license license:gpl3+)))
 
-(define-public python-pysolr
-  (package
-    (name "python-pysolr")
-    (version "3.9.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "pysolr" version))
-        (sha256
-         (base32
-          "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:tests? #f)) ; Tests require network access.
-    (propagated-inputs
-     (list python-requests))
-    (native-inputs
-     (list python-setuptools-scm))
-    (home-page "https://github.com/django-haystack/pysolr/")
-    (synopsis "Lightweight python wrapper for Apache Solr")
-    (description
-     "This module provides an interface that queries the Apache Solr server
-using a pure Python implementation.")
-    (license license:bsd-3)))
-
 (define-public python-pyjsparser
   (package
     (name "python-pyjsparser")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 30/55] gnu: python-django-compressor: Update to 4.3.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:206f0ba91eb35d82167451445a46eeff714e83bf.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-compressor): Update to 4.3.1.
[build-system]: Use pyproject-build-system.
[arguments](phases): Set DJANGO_SETTINGS_MODULE in the invoke call and adapt
phase 'check to argument test-flags.
(test-flags): Add argument.
(tests?) : Delete argument.
---
 gnu/packages/django.scm | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index a741eb64a0..fa36b2c5b3 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1194,28 +1194,25 @@ (define-public python-django-crispy-forms
 (define-public python-django-compressor
   (package
     (name "python-django-compressor")
-    (version "2.4.1")
+    (version "4.3.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "django_compressor" version))
-        (sha256
-         (base32 "1q0m0hfg7sqmj5km924g4dgy3nx51aszzsprlp6gsin10mv0fn1k"))))
-    (build-system python-build-system)
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django_compressor" version))
+       (sha256
+        (base32 "0hl9bwdiif6pn37fw2fpm56i3vcapb1qcb82kb19q2fclq6qr1b8"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
+     '(#:test-flags '("-k" "not test_clamjs_filter")
+       #:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
              (if tests?
-               (begin
-                 (setenv "DJANGO_SETTINGS_MODULE" "compressor.test_settings")
-                 (invoke "django-admin" "test"
-                         "--pythonpath=."))
-               #t))))
-       ;; Tests fail with beautifulsoup 4.9+
-       ;; https://github.com/django-compressor/django-compressor/issues/998
-       #:tests? #f))
+                 (apply invoke "django-admin" "test"
+                        "--pythonpath=." "--settings=compressor.test_settings"
+                        test-flags)
+                 (format #t "test suite not run~%")))))))
     (propagated-inputs
      (list python-django-appconf python-rcssmin python-rjsmin))
     (native-inputs
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 31/55] gnu: python-django-haystack: Update to 3.2.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:4a3e4c2a11df995f95f679ba64313b7905bda7b5.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-haystack): Update to 3.2.1.
[build-system]: Use pyproject-build-system.
[arguments](phases): Delete phase loosen-version-restrictions. Extend and
rename phase set-gdal-lib-path to set-lib-path, add phase check.
(tests?): Delete argument.
[native-inputs]: Add geos. Delete python-pysolr.
---
 gnu/packages/django.scm | 60 ++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 16 deletions(-)

Toggle diff (93 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index fa36b2c5b3..64e4c58f41 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -471,34 +471,63 @@ (define-public python-pytest-django
 (define-public python-django-haystack
   (package
     (name "python-django-haystack")
-    (version "3.1.1")
+    (version "3.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "django-haystack" version))
         (sha256
-         (base32
-          "10kaa5641cakpra2x3jqgys085gdkjcyns26plfyrmfpjmmpa1bd"))))
-    (build-system python-build-system)
+         (base32 "194kf9ps1h8bq8q32x6nniy85grl4l5605vgbd0gw9f2xxx1kqwp"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'loosen-verion-restrictions
-           (lambda _
-             (substitute* "setup.py"
-               (("geopy.*") "geopy\",\n"))))
-         (add-before 'check 'set-gdal-lib-path
+         (add-before 'check 'set-lib-path
            (lambda* (#:key inputs #:allow-other-keys)
-             (setenv "GDAL_LIBRARY_PATH"
-                     (string-append (assoc-ref inputs "gdal")
-                                    "/lib"))))
+             (setenv "LD_LIBRARY_PATH"
+                     (string-append
+                      (assoc-ref inputs "gdal") "/lib"
+                      ":" (assoc-ref inputs "geos") "/lib"))))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (begin
+                 ;; Delete absent elasticsearch tests.
+                 (delete-file-recursively "test_haystack/elasticsearch_tests")
+                 (delete-file-recursively "test_haystack/elasticsearch2_tests")
+                 (delete-file-recursively "test_haystack/elasticsearch5_tests")
+                 (delete-file-recursively "test_haystack/elasticsearch7_tests")
+                 ;; Solr tests require a running solr server.
+                 ;; Deactivating solr.
+                 (delete-file-recursively "test_haystack/solr_tests")
+                 (delete-file "haystack/backends/solr_backend.py")
+                 (delete-file
+                  "haystack/management/commands/build_solr_schema.py")
+                 (delete-file
+                  "test_haystack/test_altered_internal_names.py")
+                 (delete-file "test_haystack/multipleindex/tests.py")
+                 (delete-file "test_haystack/spatial/test_spatial.py")
+                 (substitute* "test_haystack/test_loading.py"
+                   (("class ConnectionHandlerTestCase" all)
+                    (string-append
+                     "\nfrom nose.plugins.attrib import attr"
+                     "\n@attr('skip')"
+                     "\n" all)))
+                 (substitute* "test_haystack/settings.py"
+                   (("\"solr\":")
+                    (string-append
+                     "\"solr\": {\"ENGINE\": \"test_haystack.mocks.MockEngine\"}}"
+                     "\n_={\"solr\":")))
+                 ;; Run tests.
+                 (invoke "django-admin"
+                         "test" "--settings=test_haystack.settings"
+                         "--pythonpath=.")))))
          ;; Importing this module requires setting up a Django project.
-         (delete 'sanity-check))
-       #:tests? #f)) ; OSError: libgdal.so.27: cannot open shared object file
+              (delete 'sanity-check))))
     (propagated-inputs
      (list python-django))
     (native-inputs
-     (list gdal
+     (list gdal geos
            python-coverage
            python-dateutil
            python-geopy
@@ -506,7 +535,6 @@ (define-public python-django-haystack
            python-nose
            python-requests
            python-setuptools-scm
-           python-pysolr
            python-whoosh))
     (home-page "https://haystacksearch.org/")
     (synopsis "Pluggable search for Django")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 32/55] gnu: python-hyperkitty: Update to 1.3.7.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:7ce39691bab6331aa47751bb95e3b8f897b720a5.1693931491.git.ngraves@ngraves.fr

* gnu/packages/mail.scm (python-hyperkitty): Update to 1.3.7.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-django-debug-toolbar, tzdata-for-tests.
---
 gnu/packages/mail.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Toggle diff (44 lines)diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index d3c3c8fd0b..78e4f21a00 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3619,15 +3619,14 @@ (define-public python-mailman-hyperkitty
 (define-public python-hyperkitty
   (package
     (name "python-hyperkitty")
-    (version "1.3.5")
+    (version "1.3.7")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "HyperKitty" version))
-        (sha256
-         (base32
-          "11lz1s2p8n43h1cdr9l5dppsigg8qdppckdwdndzn7a8r8mj4sc2"))))
-    (build-system python-build-system)
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "HyperKitty" version))
+       (sha256
+        (base32 "1jq2h7fgrnyfkgk8j2hxa67jjbirfb79wcv2r90nfm1hxjisqx2d"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -3654,11 +3653,13 @@ (define-public python-hyperkitty
            python-robot-detection))
     (native-inputs
      (list python-beautifulsoup4
+           python-django-debug-toolbar
            python-elasticsearch
            python-isort
            python-lxml
            python-mock
-           python-whoosh))
+           python-whoosh
+           tzdata-for-tests))
     (home-page "https://gitlab.com/mailman/hyperkitty")
     (synopsis "Web interface to access GNU Mailman v3 archives")
     (description
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 33/55] gnu: Add python-django-requests-debug-toolbar.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:b128b5fc391fc64990e7ac713e9c0ca34c9d0c21.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-requests-debug-toolbar): New variable.

---

gnu/packages/django.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (34 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 64e4c58f41..a6afe22f08 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -308,6 +308,27 @@ (define-public python-django-localflavor
 that are useful for particular countries or cultures.")
     (license license:bsd-3)))
 
+(define-public python-django-requests-debug-toolbar
+  (package
+    (name "python-django-requests-debug-toolbar")
+    (version "0.0.5")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "django-requests-debug-toolbar" version))
+              (sha256
+               (base32
+                "0y08hnziblz0m9y0pfv2ibm0dchmw85hqaj49f56a3bh330qavdb"))))
+    (build-system pyproject-build-system)
+    (arguments
+     '(#:tests? #f)) ; no tests.
+    (propagated-inputs (list python-django-debug-toolbar))
+    (home-page
+     "https://github.com/marceltschoppch/django-requests-debug-toolbar")
+    (synopsis "A Django Debug Toolbar panel for Requests")
+    (description
+     "This package provides a Django Debug Toolbar panel for Requests.")
+    (license license:expat)))
+
 (define-public python-django-simple-math-captcha
   (let ((commit "61adb4f43bfc654da61fa7b84ea4f455e31f0bd2")
         (revision "0"))
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 34/55] gnu: postorius: Update to 1.3.7.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:456dc49b05240daef0e239d68c01e26b922d2cb1.1693931491.git.ngraves@ngraves.fr

* gnu/packages/mail.scm (postorius): Update to 1.3.7.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-django-requests-debug-toolbar.
---
 gnu/packages/mail.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 78e4f21a00..d971930140 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3671,15 +3671,14 @@ (define-public python-hyperkitty
 (define-public postorius
   (package
     (name "postorius")
-    (version "1.3.6")
+    (version "1.3.7")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "postorius" version))
        (sha256
-        (base32
-         "0s0sv97nmszl5pl9rnnyzp3sxpmdhpxqrdwv7nc0ww8zs99w831b"))))
-    (build-system python-build-system)
+        (base32 "1w520df39krrkxhyppyhgg3zzfrzvg90wcjxxgyw1pmz4p8ajh1x"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -3689,13 +3688,14 @@ (define-public postorius
              (if tests?
                  (invoke "python" "example_project/manage.py" "test"
                          "--settings=test_settings" "postorius")
-                 #t))))
+                 (format #t "test suite not run~%")))))
        #:tests? #f)) ; Tests try to run a mailman instance to test against.
     (inputs
      (list python-readme-renderer python-mailmanclient
            python-django python-django-mailman3))
     (native-inputs
-     (list python-beautifulsoup4 python-isort python-mock python-vcrpy))
+     (list python-beautifulsoup4 python-isort python-mock python-vcrpy
+           python-django-requests-debug-toolbar))
     (home-page "https://gitlab.com/mailman/postorius")
     (synopsis "Web user interface for GNU Mailman")
     (description
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 35/55] gnu: python-django-rest-framework: Update to 3.14.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:0ff82215399215b281e32aa9875373c2fbd10105.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-rest-framework): Update to 3.14.0.
[build-system]: Use pyproject-build-system.
[arguments]: Delete phases.
---
 gnu/packages/django.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index a6afe22f08..70ed21d93b 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1154,7 +1154,7 @@ (define-public python-django-tagging
 (define-public python-django-rest-framework
   (package
     (name "python-django-rest-framework")
-    (version "3.13.1")
+    (version "3.14.0")
     (source
      (origin
        (method git-fetch)
@@ -1163,17 +1163,8 @@ (define-public python-django-rest-framework
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "11wfb156yin6mlgcdzfmi267jsq1cld131mxgd13aqsrj06zlray"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? inputs #:allow-other-keys)
-             (if tests?
-                 (invoke "python" "runtests.py")
-                 (format #t "test suite not run~%")))))))
+        (base32 "0gipd74hc58wxfi4wq37saygvphk1dlrh4jw7anjgpajffgz8y0n"))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest python-pytest-django tzdata-for-tests))
     (propagated-inputs
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 36/55] gnu: python-django: Update default version to 4.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:882980fc5fe6945d0412df1cfd8245f82838c8e3.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django): Update default version to 4.0.

---

gnu/packages/django.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 70ed21d93b..ebb95db61c 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -214,7 +214,7 @@ (define-public python-django-3.1.14
        (append python-asgiref-3.4.1)))))
 
 ;; Use 3.2 LTS as the default until packages gain support for 4.x.
-(define-public python-django python-django-3.2)
+(define-public python-django python-django-4.0)
 
 (define-public python-django-extensions
   (package
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 38/55] gnu: python-django-filter: Update to 22.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:11883927d2590ad1286a804623f3ffda55bb08f0.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-filter): Update to 22.1.
[build-sytem] Use pyproject-build-system.
[synopsis] Simpler synopsis.
[description] More precise description.
---
 gnu/packages/django.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 3a4a96c560..7c4a09680f 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -571,14 +571,14 @@ (define-public python-django-haystack
 (define-public python-django-filter
   (package
     (name "python-django-filter")
-    (version "2.3.0")
+    (version "22.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-filter" version))
               (sha256
                (base32
-                "1bz5qzdk9pk4a2lp2yacrdnqmkv24vxnz4k3lykrnpc3b7bkvrhi"))))
-    (build-system python-build-system)
+                "19abb7ikcjxfwggjh0bx40sx2dpv7q60bchva6r86zjgx1v3nizd"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -590,12 +590,12 @@ (define-public python-django-filter
            python-django-crispy-forms python-mock
            tzdata-for-tests))
     (home-page "https://django-filter.readthedocs.io/en/latest/")
-    (synopsis "Reusable Django application to filter querysets dynamically")
+    (synopsis "Django application filtering querysets dynamically")
     (description
-     "Django-filter is a generic, reusable application to alleviate writing
-some of the more mundane bits of view code.  Specifically, it allows users to
-filter down a queryset based on a model’s fields, displaying the form to let
-them do this.")
+     "This package provides @code{django-filter}, a generic and
+reusable application to alleviate writing some of the more mundane bits of
+view code.  Specifically, it allows users to filter down a queryset based on a
+model’s fields, displaying the form to let them do this.")
     (license license:bsd-3)))
 
 (define-public python-django-allauth
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 37/55] gnu: python-django-taggit: Update to 3.1.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:80cbb6352bc8ec18c2c5f6d432c43620d48562ec.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-taggit): Update to 3.1.0.
[build-sytem] Use pyproject-build-system.
[propagated-inputs] Add python-sqlparse.
[native-inputs] Add python-django-rest-framework. Remove python-pytest,
python-mock.
[synopsis] Simpler synopsis.
[description] More precise description.
---
 gnu/packages/django.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index ebb95db61c..3a4a96c560 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
 ;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,7 @@ (define-module (gnu packages django)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix deprecation)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -391,15 +393,14 @@ (define-public python-django-classy-tags
 (define-public python-django-taggit
   (package
     (name "python-django-taggit")
-    (version "1.3.0")
+    (version "3.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-taggit" version))
        (sha256
-        (base32
-         "0bbkabbs77z229ps0800gxfhf75yagp4x4j5jzfysbac3zvkp0sa"))))
-    (build-system python-build-system)
+        (base32 "024mwbapzy421sfwws60f04qh2709631spfpnf4r14w7wgmf9wn8"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -407,15 +408,17 @@ (define-public python-django-taggit
            (lambda _
              (invoke "python3" "-m" "django" "test" "--settings=tests.settings"))))))
     (propagated-inputs
-     (list python-django python-isort))
+     (list python-django python-isort python-sqlparse))
     (native-inputs
-     (list python-pytest python-mock))
+     (list python-django-rest-framework
+           tzdata-for-tests))
     (home-page
      "https://github.com/jazzband/django-taggit")
     (synopsis
-     "Reusable Django application for simple tagging")
+     "Django application for simple tagging")
     (description
-     "Django-taggit is a reusable Django application for simple tagging.")
+     "This package provides @code{django-taggit}, a reusable Django
+application for simple tagging.")
     (license license:bsd-3)))
 
 (define-public python-easy-thumbnails
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 40/55] gnu: Add python-django-treebeard.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:e8d5becc556741cdd8c49465b53dd23997e93b33.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-treebeard): New variable.

---

gnu/packages/django.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 7458f64ee4..6f772f3a5f 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -421,6 +421,34 @@ (define-public python-django-taggit
 application for simple tagging.")
     (license license:bsd-3)))
 
+(define-public python-django-treebeard
+  (package
+    (name "python-django-treebeard")
+    (version "4.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-treebeard" version))
+       (sha256
+        (base32 "12s6xyiyjvxnjdbnbj9wab5mdj69d1aj77lkfzmj9mbp0823baw4"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs (list python-django
+                             python-sqlparse))
+    (native-inputs (list python-wheel
+                         python-pytest-django))
+    (home-page "https://github.com/django-treebeard/django-treebeard/")
+    (synopsis "Efficient tree implementations for Django")
+    (description
+     "This package provides @code{django-treebeard}, an efficient tree
+implementations for Django.  It includes 3 different tree implementations
+with the same API:
+@itemize
+@item Adjacency List
+@item Materialized Path
+@item Nested Sets
+@end itemize")
+    (license license:bsd-3)))
+
 (define-public python-easy-thumbnails
   (package
     (name "python-easy-thumbnails")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 41/55] gnu: Add python-parsy.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:ccabc84c4afebe3e77091d1c73b068bdf1996a23.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-parsy): New variable.

---

gnu/packages/python-xyz.scm | 18 ++++++++++++++++++

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c1237725b3..32666281c8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4025,6 +4025,24 @@ (define-public python-parsley
 language.")
     (license license:expat)))
 
+(define-public python-parsy
+  (package
+    (name "python-parsy")
+    (version "1.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "parsy" version))
+       (sha256
+        (base32 "00pkd1irxp1c9mcg3x1k3ny8jl7w5jfxp45ky0qp9s90wmri6hbw"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-attrs))
+    (home-page "https://github.com/python-parsy/parsy")
+    (synopsis "Parsing in pure Python")
+    (description "This package provides easy-to-use parser combinators, for
+parsing in pure Python.")
+    (license license:expat)))
+
 (define-public python-polib
   (package
     (name "python-polib")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 39/55] gnu: Add python-django-modelcluster.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:6795871d2c4ec964b005175644243c2784d11a19.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-modelcluster): New variable.

---

gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (47 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 7c4a09680f..7458f64ee4 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -898,6 +898,40 @@ (define-public python-django-contrib-comments
 entries, photos, book chapters, or anything else.")
     (license license:bsd-3)))
 
+(define-public python-django-modelcluster
+  (package
+    (name "python-django-modelcluster")
+    (version "6.0")
+    ;; tests are not packaged in pypi
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wagtail/django-modelcluster")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "19xskhh2wvl696jmji54b1p70kjbcxzwmw3v5ic54ifn8cx6za57"))))
+    (build-system pyproject-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "runtests.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-django python-pytz))
+    (native-inputs
+     (list python-django-taggit tzdata-for-tests))
+    (home-page "https://github.com/wagtail/django-modelcluster")
+    (synopsis
+     "Django extension to allow working with 'clusters' of models as a single unit")
+    (description
+     "This package provides a Django extension to allow working with
+'clusters' of models as a single unit, independently of the database")
+    (license license:bsd-3)))
+
 (define-public python-django-pipeline
   (package
     (name "python-django-pipeline")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 42/55] gnu: Add python-jinjalint.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:73153d782cb8b3172705037b7b0e62d7f4d12277.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-jinjalint): New variable.

---

gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++

1 file changed, 39 insertions(+)

Toggle diff (52 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 32666281c8..b40f711d72 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5549,6 +5549,45 @@ (define-public python-pysdl2
 common SDL2 functionality.")
     (license license:cc0)))
 
+(define-public python-jinjalint
+  (package
+    (name "python-jinjalint")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jinjalint" version))
+       (sha256
+        (base32 "09qqqi6iggr64zms9j9sgfq9v5samvsqyyqk0s1y4gfjy6lf9424"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-build
+           (lambda _
+             ;; Lift requirements.
+             (substitute* "requirements.txt"
+               (("parsy==1.1.0.*") "parsy\n")
+               (("attrs==17.2.*") "attrs\n")
+               (("docopt==0.6.2.*") "docopt\n"))
+             ;; Python 3.10 support.
+             (substitute* "jinjalint/util.py"
+               (("import collections")
+                "from collections.abc import Iterable")
+               (("collections\\.Iterable")
+                "Iterable"))))
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python3" "-m" "jinjalint" "jinjalint/test.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-attrs python-docopt python-parsy))
+    (home-page "https://github.com/motet-a/jinjalint")
+    (synopsis "Linter for Jinja-like templates")
+    (description "This package provides @code{jinjalint} a linter for
+Jinja-like templates in Python.")
+    (license license:expat)))
+
 (define-public python-pystache
   (package
     (name "python-pystache")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 43/55] gnu: Add python-willow.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:5286ad8e4016f4d4f686811c9bf882cad2a3d8e3.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-willow): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (40 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b40f711d72..b107a7f4a1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8833,6 +8833,33 @@ (define-public python-pixelmatch
 metrics.")
     (license license:isc)))
 
+(define-public python-willow
+  (package
+    (name "python-willow")
+    (version "1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Willow" version))
+       (sha256
+        (base32 "12k5mv9jh0f5vjm87ss4d7kbkrcb3n5fa0gk9pvf9n3jk3d2rr1z"))))
+    (build-system pyproject-build-system)
+    (inputs
+     (list freetype lcms libjpeg-turbo libtiff libwebp openjpeg zlib))
+    (propagated-inputs
+     (list python-defusedxml python-filetype))
+    (home-page "https://github.com/wagtail/Willow")
+    (synopsis
+     "A wrapper that combines the functionality of multiple Python image
+libraries into one API")
+    (description
+     "Willow is a simple image library that combines the APIs of Pillow, Wand
+and OpenCV. It converts the image between the libraries when necessary. Willow
+currently has basic resize and crop operations, face and feature detection and
+animated GIF support. New operations and library integrations can also be
+easily implemented.")
+    (license license:bsd-3)))
+
 (define-public python-imagecodecs
   (package
     (name "python-imagecodecs")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 44/55] gnu: Add python-django-request.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:97cefe7d9976a8b7635849e8c6c969c5f21e57e1.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-request): New variable.

---

gnu/packages/django.scm | 37 +++++++++++++++++++++++++++++++++++++

1 file changed, 37 insertions(+)

Toggle diff (50 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 6f772f3a5f..623aed03d8 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -310,6 +310,43 @@ (define-public python-django-localflavor
 that are useful for particular countries or cultures.")
     (license license:bsd-3)))
 
+(define-public python-django-request
+  (package
+    (name "python-django-request")
+    (version "1.6.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/django-request/django-request")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1hncmcxral2h51jrgvzlhwqk37xyq7wjbf79hh4ik13prigxabwi"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "runtests.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs
+     (list python-dateutil python-django python-six))
+    (native-inputs
+     (list python-sqlparse python-mock
+           tzdata-for-tests))
+    (home-page "https://django-request.readthedocs.io")
+    (synopsis
+     "Statistics module for django")
+    (description
+     "This package provides a statistics module for django.  It stores
+requests in a database for admins to see, it can also be used to get
+statistics on who is online etc.")
+    (license license:expat)))
+
 (define-public python-django-requests-debug-toolbar
   (package
     (name "python-django-requests-debug-toolbar")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 45/55] gnu: Add python-django-environ.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:85573f4962b3eb79562298ac410f64c55725aeb8.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-environ): New variable.

---

gnu/packages/django.scm | 19 +++++++++++++++++++

1 file changed, 19 insertions(+)

Toggle diff (32 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 623aed03d8..fb00bf5963 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -218,6 +218,25 @@ (define-public python-django-3.1.14
 ;; Use 3.2 LTS as the default until packages gain support for 4.x.
 (define-public python-django python-django-4.0)
 
+(define-public python-django-environ
+  (package
+    (name "python-django-environ")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-environ" version))
+       (sha256
+        (base32 "09bjlzvi6avaa0cwjvfz5ihjqxv44f3ys70ckr57g7cw8f8rlmdk"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-coverage python-pytest))
+    (home-page "https://django-environ.readthedocs.io")
+    (synopsis
+     "Use environment variables to configure your Django application")
+    (description "This package provides 12factor inspired environment
+variables to configure your Django application.")
+    (license license:expat)))
+
 (define-public python-django-extensions
   (package
     (name "python-django-extensions")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 47/55] gnu: Add python-l18n.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:a0732e595eead3969056f3b0e86da2b76e2d83f5.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-l18n): New variable.

---

gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++

1 file changed, 20 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c849521161..148f70b615 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1891,6 +1891,26 @@ (define-public python-shortuuid
 module and then similar looking characters are removed.")
     (license license:bsd-3)))
 
+(define-public python-l18n
+  (package
+    (name "python-l18n")
+    (version "2021.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "l18n" version))
+       (sha256
+        (base32 "0j6q89d1mk03snvj4v1600fbrxjlq59k5490rhsp3lbkss8fhmhr"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-wheel))
+    (propagated-inputs (list python-pytz python-six))
+    (home-page "https://github.com/tkhyn/l18n")
+    (synopsis "Internationalization for timezones and territories")
+    (description
+     "This package provides internationalization for @code{python-pytz}
+timezones and territories.")
+    (license license:expat)))
+
 (define-public python-logwrap
   (package
     (name "python-logwrap")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 46/55] gnu: Add python-draftjs-exporter.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:593cca746cca18d36196e2f4721694b044ecc859.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-draftjs-exporter): New variable.

---

gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++

1 file changed, 36 insertions(+)

Toggle diff (49 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b107a7f4a1..c849521161 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9619,6 +9619,42 @@ (define-public python-decorator
 etc.  The core of this module is a decorator factory.")
     (license license:expat)))
 
+(define-public python-draftjs-exporter
+  (package
+    (name "python-draftjs-exporter")
+    (version "2.1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://github.com/springload/draftjs_exporter"
+         "/archive/refs/tags/v" version ".tar.gz"))
+       (sha256
+        (base32 "02fjmzagvnc146zqhc0xg6mybrkjg3pc7wbl4pmbq4gvmwjsml4c"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-beautifulsoup4
+                         python-html5lib
+                         python-lxml))
+    (arguments
+     `(#:test-flags '("-m" "unittest" "discover"
+                      ;; FIXME disabling two unexpected failing tests
+                      "-k" "not test_export_lxml_big_content_export"
+                      "-k" "not test_export_lxml_entity_with_data-*")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
+             (if tests?
+                 (apply invoke "python" test-flags)
+                 (format #t "test suite not run~%")))))))
+    (home-page "https://github.com/springload/draftjs_exporter")
+    (synopsis
+     "Library to convert rich text from Draft.js raw ContentState to HTML")
+    (description
+     "This package provides a python library to convert rich text from Draft.js raw
+ContentState to HTML.")
+    (license license:expat)))
 
 (define-public python-drmaa
   (package
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 48/55] gnu: Add python-anyascii.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:706344eba01f26df0f03ed397d7e2f3923e24d96.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-anyascii): New variable.

---

gnu/packages/python-xyz.scm | 17 +++++++++++++++++

1 file changed, 17 insertions(+)

Toggle diff (30 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 148f70b615..7312263c9d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -279,6 +279,23 @@ (define-module (gnu packages python-xyz)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26))
 
+(define-public python-anyascii
+  (package
+    (name "python-anyascii")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "anyascii" version))
+       (sha256
+        (base32 "1xhibjqqn97pq90dsrqks265rr550napaz7d3v4qdqh6h9r5gpyy"))))
+    (build-system pyproject-build-system)
+    (home-page "https://github.com/anyascii/anyascii")
+    (synopsis "Unicode to ASCII transliteration")
+    (description "This package provides Unicode to ASCII transliteration for
+Python.")
+    (license license:expat)))
+
 (define-public python-xmldiff
   (package
     (name "python-xmldiff")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 49/55] gnu: Add python-telepath.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:9bd37ac043c0340188c8f5e73f1a7a1c77ffd2ea.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-telepath): New variable.

---

gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++

1 file changed, 29 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index fb00bf5963..e0fec3caa9 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1633,3 +1633,32 @@ (define-public python-django-cleanup
 ImageField and their subclasses.  Files set as default values for any
 FileField are not deleted.")
     (license license:expat)))
+
+(define-public python-telepath
+  (package
+    (name "python-telepath")
+    (version "0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "telepath" version))
+       (sha256
+        (base32 "0k7q5dqgvcwnslb82ah0g6p772jzjmb6fd4wcdc8r46ibsjg4k7g"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-django python-pytest-django))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (setenv "DJANGO_SETTINGS_MODULE" "telepath.test_settings")
+                   (invoke "django-admin" "test" "--pythonpath=."))
+                 (format #t "test suite not run~%")))))))
+    (home-page "https://github.com/wagtail/telepath")
+    (synopsis "Exchanging data between Python and JavaScript")
+    (description
+     "This package provides @code{telepath}, a library for exchanging data
+between Python and JavaScript.")
+    (license license:bsd-3)))
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 50/55] gnu: Add python-django-permissionedforms.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:54875d84336ca879cac7c25647d6e935a9afac99.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-permissionedforms): New variable.

---

gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (47 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index e0fec3caa9..74a1b7366a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -878,6 +878,40 @@ (define-public python-dj-database-url
 conn_max_age argument to easily enable Django’s connection pool.")
     (license license:bsd-2)))
 
+(define-public python-django-permissionedforms
+  (package
+    (name "python-django-permissionedforms")
+    (version "0.1")
+    ;; tests are not packaged in pypi
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wagtail/django-permissionedforms")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0dscl238yi4xyd4nz2cxr5kikyalqj5drmk935llal3rd0dcy30d"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "runtests.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-django))
+    (native-inputs (list python-django-modelcluster))
+    (home-page "https://github.com/wagtail/django-permissionedforms")
+    (synopsis
+     "Create forms that vary according to user permissions in Django")
+    (description
+     "This package provides a Django extension for creating forms that vary
+according to user permissions.")
+    (license license:bsd-3)))
+
 (define-public python-django-picklefield
   (package
     (name "python-django-picklefield")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 51/55] gnu: python-openpyxl: Update to 3.1.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:3e9bd72417ca2fcd67fd7972030010a48d72d43a.1693931491.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-openpyxl): Update to 3.1.2.
[build-sytem] Use pyproject-build-system.
---
 gnu/packages/python-xyz.scm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7312263c9d..e9d05f6779 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3491,7 +3491,7 @@ (define-public python-omero-py
 (define-public python-openpyxl
   (package
     (name "python-openpyxl")
-    (version "3.0.9")
+    (version "3.1.2")
     (source
      (origin
        ;; We use the upstream repository, as the tests are not included in the
@@ -3502,13 +3502,8 @@ (define-public python-openpyxl
              (changeset version)))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
-        (base32 "1p8xvc2gjw6zyzbd7qdvc3x178sm00ymrbyh9539l4fpzgxh0j9c"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (invoke "pytest"))))))
+        (base32 "0dvfv8vbbaqzchhjiyripy7blbj4sc4zhpbh60zabkx2aix83jjh"))))
+    (build-system pyproject-build-system)
     (native-inputs (list python-lxml python-pillow python-pytest))
     (propagated-inputs (list python-et-xmlfile python-jdcal))
     (home-page "https://openpyxl.readthedocs.io")
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 52/55] gnu: Add python-wagtail.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:0f2a2f4acbb979fcf6172b142f6eeb1cf75753bd.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-wagtail): New variable.

---

gnu/packages/django.scm | 70 +++++++++++++++++++++++++++++++++++++++++

1 file changed, 70 insertions(+)

Toggle diff (80 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 74a1b7366a..924e1ab6b3 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1696,3 +1696,73 @@ (define-public python-telepath
      "This package provides @code{telepath}, a library for exchanging data
 between Python and JavaScript.")
     (license license:bsd-3)))
+
+(define-public python-wagtail
+  (package
+    (name "python-wagtail")
+    (version "5.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "wagtail" version))
+       (sha256
+        (base32 "1fyjxb4g0mnmpr802jddylj6lc2fy4pf3zazsr2k9nx5hzgj3gfy"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:test-flags '("--pythonpath=."
+                      "--settings=wagtail.test.settings"
+                      ;; disabling failing azure tests
+                      "-k" "not test_azure_cdn_get_client"
+                      "-k" "not test_azure_cdn_purge"
+                      "-k" "not test_azure_front_door_get_client"
+                      "-k" "not test_azure_front_door_purge")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'hiding-failing-tests-imports
+           (lambda _
+             (substitute* "wagtail/contrib/frontend_cache/tests.py"
+               (("from azure" all)
+                (string-append "#" all)))))
+         (replace 'check
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
+             (if tests?
+                 (apply invoke "django-admin" "test" test-flags)))))))
+    (propagated-inputs
+     (list python-anyascii
+           python-beautifulsoup4
+           python-django-4.0
+           python-django-filter
+           python-django-modelcluster
+           python-django-taggit
+           python-django-permissionedforms
+           python-django-treebeard
+           python-django-rest-framework
+           python-draftjs-exporter
+           python-html5lib
+           python-l18n
+           python-openpyxl
+           python-pillow
+           python-requests
+           python-telepath
+           python-willow))
+    (native-inputs
+     ;; python-azure-mgmt-cdn ;failing tests
+     ;; python-azure-mgmt-frontdoor ;failing tests
+     (list python-boto3
+           python-dateutil
+           python-doc8
+           python-docutils
+           python-elasticsearch
+           python-freezegun
+           python-isort
+           python-jinja2
+           python-jinjalint
+           python-polib
+           python-pytz
+           python-unidecode
+           python-wagtail-factories))
+    (home-page "https://wagtail.org/")
+    (synopsis "A Content Management System (CMS)")
+    (description "This package provides a Content Management System based on
+Django.")
+    (license license:bsd-3)))
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 53/55] gnu: Add python-wagtail-factories.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:1f35e0dd4d5bfb2d707dc48f59512d525daf26d2.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-wagtail-factories): New variable.

---

gnu/packages/django.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Toggle diff (48 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 924e1ab6b3..20a4250b4d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1766,3 +1766,41 @@ (define-public python-wagtail
     (description "This package provides a Content Management System based on
 Django.")
     (license license:bsd-3)))
+
+(define-public python-wagtail-factories
+  (package
+    (name "python-wagtail-factories")
+    (version "4.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       ;; Fetch from the git repository, so that the tests can be run.
+       (uri (git-reference
+             (url "https://github.com/wagtail/wagtail-factories/")
+             (commit (string-append "v" version))))
+       (file-name (string-append name "-" version))
+       (sha256
+        (base32 "19ggc9nm31w7gq2k48ijhiq8dgkh63dsycvhrklxsrh8zwkwgln4"))))
+    (build-system pyproject-build-system)
+    (arguments
+     '(#:test-flags '("--settings=tests.settings" "--pythonpath=.")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
+             (if tests?
+                 (apply invoke "django-admin" "test" test-flags)
+                 (format #t "test suite not run~%"))))
+         ;; Importing this module requires setting up a Django project.
+         (delete 'sanity-check))))
+    (propagated-inputs (list python-factory-boy))
+    (native-inputs (list python-pytest
+                         python-pytest-django
+                         (package/inherit python-wagtail
+                               (native-inputs '())
+                               (arguments '(#:tests? #f)))))
+    (home-page "https://github.com/wagtail/wagtail-factories/")
+    (synopsis "Factory boy classes for wagtail")
+    (description "This package provides factory boy classes for
+@code{wagtail}. It is used for the migrating streamfields.")
+    (license license:expat)))
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 54/55] gnu: Add python-wagtail-localize.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:4d5a70e2000fff7a2b063fef3fadf1dd03904d41.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-wagtail-localize): New variable.

---

gnu/packages/django.scm | 40 ++++++++++++++++++++++++++++++++++++++++

1 file changed, 40 insertions(+)

Toggle diff (50 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 20a4250b4d..30824efc8a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1804,3 +1804,43 @@ (define-public python-wagtail-factories
     (description "This package provides factory boy classes for
 @code{wagtail}. It is used for the migrating streamfields.")
     (license license:expat)))
+
+(define-public python-wagtail-localize
+  (package
+    (name "python-wagtail-localize")
+    (version "1.5.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wagtail/wagtail-localize")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "143rwwz94wlqwbckg8ccfxkn5ydb1mzr9dqn4zldpsrbgg3p4cj6"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; TODO Remove this when moving to recent versions of flit-core.
+         (add-after 'unpack 'fix-flit-core-glob
+           (lambda _
+             (substitute* "pyproject.toml"
+               (("wagtail_localize\\/\\*\\*\\/tests")
+                (string-join
+                 (find-files "." "tests$" #:directories? #t)
+                 "\",\n    \"")))))
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "testmanage.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-django python-polib python-wagtail))
+    (native-inputs (list python-dj-database-url
+                         python-flit-core
+                         python-freezegun
+                         python-typing-extensions))
+    (home-page "https://www.wagtail-localize.org")
+    (synopsis "Translating for Wagtail Content Management System (CMS)")
+    (description "This package provides a translation plugin for Wagtail CMS.")
+    (license license:bsd-3)))
-- 
2.41.0

Nicolas Graves wrote on 5 Sep 2023 18:31

[PATCH v6 55/55] gnu: python-django: Update to 4.1.9.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:c019a924ab0f166920d962b9f923bfb9b38fd89b.1693931491.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django): Update to 4.1.9.

---

gnu/packages/django.scm | 15 +++++++--------

1 file changed, 7 insertions(+), 8 deletions(-)

Toggle diff (60 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 30824efc8a..d3971b71e6 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -142,21 +142,21 @@ (define-public python-django-4.2
     (license license:bsd-3)
     (properties `((cpe-name . "django")))))
 
-(define-public python-django-4.0
+(define-public python-django-4.1
   (package
     (inherit python-django-4.2)
     (name "python-django")
-    (version "4.0.9")
+    (version "4.1.9")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))))
+                "0cphp9naxpim4jw9sws7185cb061qdaymz0vhw222rih96l79w79"))))))
 
 (define-public python-django-3.2
   (package
-    (inherit python-django-4.0)
+    (inherit python-django-4.1)
     (version "3.2.18")
     (source (origin
               (method url-fetch)
@@ -166,7 +166,7 @@ (define-public python-django-3.2
                 "1fikqpf75zjlx7dgdrrrz4212cajp6rl79rw0zzlzdifi7z8s808"))))
     (native-search-paths '())           ;no need for TZDIR
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-django-4.0)
+     (modify-inputs (package-propagated-inputs python-django-4.1)
        ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
        (append python-pytz)))))
 
@@ -215,8 +215,7 @@ (define-public python-django-3.1.14
        (delete "python-asgiref")
        (append python-asgiref-3.4.1)))))
 
-;; Use 3.2 LTS as the default until packages gain support for 4.x.
-(define-public python-django python-django-4.0)
+(define-public python-django python-django-4.1)
 
 (define-public python-django-environ
   (package
@@ -1730,7 +1729,7 @@ (define-public python-wagtail
     (propagated-inputs
      (list python-anyascii
            python-beautifulsoup4
-           python-django-4.0
+           python-django
            python-django-filter
            python-django-modelcluster
            python-django-taggit
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 01/57] gnu: python-django-4.0: Update to 4.0.9.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:68f75e9d42cc8c0c8d0fa78cd0817b28dfb774c6.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-4.0): Update to 4.0.9.

---

gnu/packages/django.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b089954b6b..41ab8576a0 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -55,13 +55,13 @@ (define-module (gnu packages django)
 (define-public python-django-4.0
   (package
     (name "python-django")
-    (version "4.0.7")
+    (version "4.0.9")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "0qblhh7s7fcznqr79919yp2d7wiz3ixv39navmifb677dg9mlvcw"))))
+                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))
     (build-system python-build-system)
     (arguments
      '(#:phases

base-commit: 6113e0529d61df7425f64e30a6bf77f7cfdfe5a5
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 02/57] gnu: python-asgiref: Update to 3.6.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:a7ebb31c833365eaad518cfbe909a6fcfa8822dc.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-web.scm (python-asgiref): Update to 3.6.0.

---

gnu/packages/python-web.scm | 13 +++----------

1 file changed, 3 insertions(+), 10 deletions(-)

Toggle diff (30 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93fd2d2278..fe3916864e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -548,20 +548,13 @@ (define-public python-aiostream
 (define-public python-asgiref
   (package
     (name "python-asgiref")
-    (version "3.4.1")
+    (version "3.6.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "asgiref" version))
               (sha256
-               (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest" "-vv")))))))
+               (base32 "01lmjidadid0czd32d2c21lb6q78ri0pr0i74a4qqg4dppkxyrwm"))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest python-pytest-asyncio))
     (home-page "https://github.com/django/asgiref/")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 03/57] gnu: Add python-asgiref-3.4.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:5006c909d0f23057aba2c3578d90b146e8366fc3.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-web.scm (python-asgiref-3.4.1): New variable.

---

gnu/packages/python-web.scm | 11 +++++++++++

1 file changed, 11 insertions(+)

Toggle diff (24 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fe3916864e..78ab265603 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -565,6 +565,17 @@ (define-public python-asgiref
 WSGI.  This package includes libraries for implementing ASGI servers.")
     (license license:bsd-3)))
 
+(define-public python-asgiref-3.4.1
+  (package
+    (inherit python-asgiref)
+    (version "3.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "asgiref" version))
+       (sha256
+        (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))))
+
 (define-public python-asgi-csrf
   (package
     (name "python-asgi-csrf")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 04/57] gnu: python-distributed: Disable failing tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:b74afed0db32847421c1c1f1b4706cb353e2ddb7.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-science.scm (python-distributed): Disable failing tests.

---

gnu/packages/python-science.scm | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 4a010b4127..ab2ceb0b2c 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -1296,7 +1296,8 @@ (define-public python-distributed
                 "test_tls_temporary_credentials_functional"
                 "test_variable_in_task"
                 "test_worker_preload_text"
-                "test_worker_uses_same_host_as_nanny")
+                "test_worker_uses_same_host_as_nanny"
+                "test_nanny_timeout") ; access to 127.0.0.1
                " and not ")
 
               ;; These fail because it doesn't find dask[distributed]
@@ -1319,7 +1320,8 @@ (define-public python-distributed
 
               ;; These tests are rather flaky
               " and not test_quiet_quit_when_cluster_leaves"
-              " and not multiple_clients_restart"))
+              " and not multiple_clients_restart"
+              " and not test_steal_twice"))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'versioneer
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 06/57] gnu: python-django-extensions: Update to 3.2.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:a585e8536826c813ae18a0284cac9b35edede920.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-extensions): Update to 3.2.0.
[source]: Add snippet to disable pip-dependent tests. Update to 3.2.0.
[build-system]: Use pyproject-build-system.
[arguments]: Enable tests.
[native-inputs]: Add python-pygments and tzdata-for-tests.
---
 gnu/packages/django.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 72127bbd34..f56d0f6565 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -204,7 +204,7 @@ (define-public python-django python-django-3.2)
 (define-public python-django-extensions
   (package
     (name "python-django-extensions")
-    (version "3.0.6")
+    (version "3.2.0")
     (source
      (origin
        (method git-fetch)
@@ -214,11 +214,11 @@ (define-public python-django-extensions
              (commit version)))
        (file-name (string-append name "-" version))
        (sha256
-        (base32
-         "0sra6hazqvspxd1pnx5cj7gia1rkaz3hn06ib4wd0frc167f5afy"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:tests? #f)) ;XXX: requires a Postgres or MySQL database
+        (base32 "1wfzlfjbicvk093xqx3qw633ap2khk6kc1ph2kwfk72wxy8yq9lf"))
+       (snippet ; Disable pip-dependent tests.
+        '(delete-file "tests/management/commands/test_pipchecker.py"))))
+    (build-system pyproject-build-system)
+    ;; TODO More tests can be enabled with a Postgres or MySQL database
     (propagated-inputs
      (list python-six python-vobject python-werkzeug python-dateutil
            python-django))
@@ -226,10 +226,12 @@ (define-public python-django-extensions
      (list python-mock
            python-factory-boy
            python-tox
+           python-pygments
            python-pytest
            python-pytest-cov
            python-pytest-django
-           python-shortuuid))
+           python-shortuuid
+           tzdata-for-tests))
     (home-page
      "https://github.com/django-extensions/django-extensions")
     (synopsis "Custom management extensions for Django")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 05/57] gnu: Add python-django-4.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:16e8672afe9d50f0e2a9f702ea3c48ef6e09d572.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-4.2): New variable.

---

gnu/packages/django.scm | 18 +++++++++++++++---

1 file changed, 15 insertions(+), 3 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 41ab8576a0..72127bbd34 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -52,16 +52,16 @@ (define-module (gnu packages django)
   #:use-module (gnu packages time)
   #:use-module (gnu packages xml))
 
-(define-public python-django-4.0
+(define-public python-django-4.2
   (package
     (name "python-django")
-    (version "4.0.9")
+    (version "4.2.2")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))
+                "1pxs4i1p55k56i8nsr9a1firgsp2pqcv1g0hxxxx17dmynznysra"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -139,6 +139,18 @@ (define-public python-django-4.0
     (license license:bsd-3)
     (properties `((cpe-name . "django")))))
 
+(define-public python-django-4.0
+  (package
+    (inherit python-django-4.2)
+    (name "python-django")
+    (version "4.0.9")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "Django" version))
+              (sha256
+               (base32
+                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))))
+
 (define-public python-django-3.2
   (package
     (inherit python-django-4.0)
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 07/57] gnu: Add python-django-extensions-3.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:d4e6284facd196a03a9751c83a994e9e6db341e3.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-extensions-3.0): New variable.
---
 gnu/packages/django.scm | 21 +++++++++++++++++++++
 gnu/packages/web.scm    |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

Toggle diff (47 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f56d0f6565..6845872ec7 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -240,6 +240,27 @@ (define-public python-django-extensions
 commands, additional database fields and admin extensions.")
     (license license:expat)))
 
+(define-public python-django-extensions-3.0
+  (package
+    (inherit python-django-extensions)
+    (name "python-django-extensions")
+    (version "3.0.6")
+    (source
+     (origin
+       (method git-fetch)
+       ;; Fetch from the git repository, so that the tests can be run.
+       (uri (git-reference
+             (url "https://github.com/django-extensions/django-extensions")
+             (commit version)))
+       (file-name (string-append name "-" version))
+       (sha256
+        (base32 "0sra6hazqvspxd1pnx5cj7gia1rkaz3hn06ib4wd0frc167f5afy"))))
+    (arguments
+     '(#:tests? #f)) ;XXX: requires a Postgres or MySQL database
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs python-django-extensions)
+       (replace "python-django" python-django-3.1.14)))))
+
 (define-public python-django-localflavor
   (package
     (name "python-django-localflavor")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 46a60b8b15..3de24cbf41 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8889,7 +8889,7 @@ (define-public archivebox
            python-croniter
            python-crontab
            python-dateparser
-           python-django-extensions
+           python-django-extensions-3.0
            python-django-3.1.14
            python-mypy-extensions))
     (native-inputs
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 08/57] gnu: python-django-3.1.14: Skip failing tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:0713b7b67b9817c732e4e0baefbc36ada576316c.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-3.1.14): Skip failing tests..
[propagated-inputs]: Replace python-agriref by python-asgiref-3.4.1.
---
 gnu/packages/django.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

Toggle diff (55 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 6845872ec7..84f18fc3d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages django)
   #:use-module (guix gexp)
   #:use-module (guix build-system python)
   #:use-module (guix deprecation)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
@@ -178,10 +179,39 @@ (define-public python-django-3.1.14
               (sha256
                (base32
                 "0ix3v2wlnplv78zxjrlw8z3hiap2d5mxvk0ny2fc65526shsb93j"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments python-django-3.2)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'skip-failing-tests
+              (lambda _
+                (substitute* "tests/inspectdb/tests.py"
+                  (("import mock, skipUnless")
+                   "import mock, skipUnless, skipIf")
+                  (("@skipUnless\\(connection\\.vendor == 'sqlite',")
+                   "@skipIf(True, "))
+                (substitute* "tests/fixtures/tests.py"
+                  (("import mock")
+                   "import mock, skipIf")
+                  (("(def test_dumpdata_proxy_with_concrete\\(self\\):)"
+                    content all)
+                   (string-append
+                    "@skipIf(True, \""
+                    "A warning isn't displayed if a proxy model is dumped with "
+                    "its concrete parent."
+                    "\")\n    " content)))
+                (substitute* "tests/httpwrappers/tests.py"
+                  (("(def test_memoryview_content\\(self\\):)"
+                    content all)
+                   (string-append
+                    "@unittest.skipIf(True, 'Bad assertion')\n    "
+                    content)))))))))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs python-django-3.2)
        ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
-       (append python-pytz)))))
+       (append python-pytz)
+       (delete "python-asgiref")
+       (append python-asgiref-3.4.1)))))
 
 (define-public python-django-2.2
   (package
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 09/57] gnu: python-django-simple-math-captcha: Update to 1.0.9-0-61adb4f.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:bc095a4abb6ff7ce341e2744cb767ce52c4f2606.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-simple-math-captcha): Update to 1.0.9-0-61adb4f.
[build-system]: Use pyproject-build-system.
[arguments](phases): Delete phase patch-six-imports.
[propagated-inputs]: Delete python-six.
---
 gnu/packages/django.scm | 66 +++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

Toggle diff (81 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 84f18fc3d1..e2754b2d57 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -324,44 +324,38 @@ (define-public python-django-localflavor
     (license license:bsd-3)))
 
 (define-public python-django-simple-math-captcha
-  (package
-    (name "python-django-simple-math-captcha")
-    (version "1.0.9")
-    (home-page "https://github.com/alsoicode/django-simple-math-captcha")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url home-page)
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fhy9k8haqa1296v0qpg1b5w7y3pyw9qi9z9laj5ijry1gk35qaw"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'patch-six-imports
-                    (lambda _
-                      ;; Django no longer bundles six, adjust the imports
-                      ;; accordingly.  The six dependency can likely be
-                      ;; removed in the next version.
-                      (substitute* (find-files "." "\\.py$")
-                        (("from django\\.utils import six")
-                         "import six"))
-                      #t))
-                  (replace 'check
-                    (lambda _
-                      (invoke "python" "runtests.py"))))))
-    (native-inputs
-     (list python-mock))
-    (propagated-inputs
-     (list python-django python-six))
-    (synopsis "Easy-to-use math field/widget captcha for Django forms")
-    (description
-     "A multi-value-field that presents a human answerable question,
+  (let ((commit "61adb4f43bfc654da61fa7b84ea4f455e31f0bd2")
+        (revision "0"))
+    (package
+      (name "python-django-simple-math-captcha")
+      (version (git-version "1.0.9" revision commit))
+      (home-page "https://github.com/alsoicode/django-simple-math-captcha")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url home-page)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "02fim6xk4islil02xg7j5nqfpmgwzyqni1y17a082fz35d94jd3i"))))
+      (build-system pyproject-build-system)
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (replace 'check
+             (lambda _
+               (invoke "python" "runtests.py"))))))
+      (native-inputs
+       (list python-mock))
+      (propagated-inputs
+       (list python-django))
+      (synopsis "Easy-to-use math field/widget captcha for Django forms")
+      (description
+       "A multi-value-field that presents a human answerable question,
 with no settings.py configuration necessary, but instead can be configured
 with arguments to the field constructor.")
-    (license license:asl2.0)))
+      (license license:asl2.0))))
 
 (define-public python-django-classy-tags
   (package
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 11/57] gnu: python-django-filter: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:696c2c55d49ff5624f67015a45b6467aeefdf6fd.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-filter): Add native-input tzdata-for-tests.

---

gnu/packages/django.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index e8c401fb68..3ceb6be3fd 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -552,7 +552,8 @@ (define-public python-django-filter
              (invoke "python" "runtests.py"))))))
     (native-inputs
      (list python-django python-django-rest-framework
-           python-django-crispy-forms python-mock))
+           python-django-crispy-forms python-mock
+           tzdata-for-tests))
     (home-page "https://django-filter.readthedocs.io/en/latest/")
     (synopsis "Reusable Django application to filter querysets dynamically")
     (description
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 10/57] gnu: python-easy-thumbnails: Update to 2.8.5.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:8d841986f3e22db32d04d75f33286b4246938aaf.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-easy-thumbnails): Update to 2.8.5.
[arguments]: Replace check phase. Ensure tests are run when requested.
---
 gnu/packages/django.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Toggle diff (34 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index e2754b2d57..e8c401fb68 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -415,15 +415,23 @@ (define-public python-django-taggit
 (define-public python-easy-thumbnails
   (package
     (name "python-easy-thumbnails")
-    (version "2.7")
+    (version "2.8.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "easy-thumbnails" version))
        (sha256
-        (base32
-         "14gzp5cv24z0qhxb7f7k7v9jgzpaj4n8yhjq83ynpx8183fs1rz4"))))
-    (build-system python-build-system)
+        (base32 "0dayfvfx9pr0d4pajrv2ji7rrpsxq5z5bxpyl6rn16zw14k92kky"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (if tests?
+                       (invoke "python" "-m" "django" "test"
+                               "--settings" "easy_thumbnails.tests.settings")
+                       (format #t "test suite not run~%")))))))
     (propagated-inputs
      (list python-django python-pillow))
     (home-page "https://github.com/SmileyChris/easy-thumbnails")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 12/57] gnu: python-django-allauth: Update to 0.47.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:014d5a7aa5536ca780be4a5a81bc12d67bd81e19.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-allauth): Update to 0.47.0.
[build-system]: Use pyproject-build-system.
[arguments](phases): Set the django settings module as argument.
---
 gnu/packages/django.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Toggle diff (34 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 3ceb6be3fd..8925b880b9 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -566,23 +566,22 @@ (define-public python-django-filter
 (define-public python-django-allauth
   (package
     (name "python-django-allauth")
-    (version "0.42.0")
+    (version "0.47.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-allauth" version))
        (sha256
         (base32
-         "0c0x8izvrnjhrr48w6pwsfk9ddbi6yfxg7v3hh5dm1vz1d0hjwpi"))))
-    (build-system python-build-system)
+         "1s65syhq466qvd3qj7xpcv02m623srazb0yjh44n4wp6qva0kkrb"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
            (lambda _
-             (setenv "DJANGO_SETTINGS_MODULE" "test_settings")
              (invoke "django-admin" "test" "allauth.tests"
-                     "--pythonpath=."))))))
+                     "--pythonpath=." "--settings=test_settings"))))))
     (propagated-inputs
      (list python-openid python-requests python-requests-oauthlib))
     (native-inputs
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 13/57] gnu: python-django-debug-toolbar: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:6db68c537637e0f7c034f33119eefcf47a71e063.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-debug-toolbar): Add native-input tzdata-for-tests.

---

gnu/packages/django.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 8925b880b9..3042dc59db 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -614,7 +614,7 @@ (define-public python-django-debug-toolbar
     (propagated-inputs
      (list python-sqlparse python-django))
     (native-inputs
-     (list python-django-jinja python-html5lib))
+     (list python-django-jinja python-html5lib tzdata-for-tests))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 14/57] gnu: python-django-picklefield: Update to 3.1.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:3e59d6f9f51f60036fa2260b37cf26b1f000f783.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-picklefield): Update to 3.1.0.
[build-system] Use pyproject-build-system.
[arguments](phases): Delete -v2 django@2.2 flag.
[propagated-inputs] Replace python-django@2.2 by python-django.
---
 gnu/packages/django.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 3042dc59db..88ed2e9d35 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -762,7 +762,7 @@ (define-public python-dj-database-url
 (define-public python-django-picklefield
   (package
     (name "python-django-picklefield")
-    (version "3.0.1")
+    (version "3.1.0")
     (home-page "https://github.com/gintas/django-picklefield")
     ;; Use a git checkout because the PyPI release lacks tests.
     (source
@@ -773,19 +773,16 @@ (define-public python-django-picklefield
               (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-         (base32
-          "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk"))))
-    (build-system python-build-system)
+         (base32 "00d8sm6cnkv5bxbs2a3qrm4g69nlaa1wari7mc697df8q91v6r0n"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
                   (replace 'check
                     (lambda _
-                      (invoke "python" "-m" "django" "test" "-v2"
+                      (invoke "python" "-m" "django" "test"
                               "--settings=tests.settings"))))))
     (propagated-inputs
-     ;; XXX: Picklefield has not been updated in 10+ years and fails tests
-     ;; with Django 3.2.
-     `(("python-django@2.2" ,python-django-2.2)))
+     (list python-django))
     (synopsis "Pickled object field for Django")
     (description "Pickled object field for Django")
     (license license:expat)))
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 15/57] gnu: Remove python-django-2.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:0e2837f593c14891a86bad9b52b3a3fee875dcb1.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-2.2): Delete variable.

---

gnu/packages/django.scm | 15 ---------------

1 file changed, 15 deletions(-)

Toggle diff (28 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 88ed2e9d35..4531484073 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -213,21 +213,6 @@ (define-public python-django-3.1.14
        (delete "python-asgiref")
        (append python-asgiref-3.4.1)))))
 
-(define-public python-django-2.2
-  (package
-    (inherit python-django-3.2)
-    (version "2.2.28")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "Django" version))
-              (sha256
-               (base32
-                "04vl7aivsshzsnn547lm4jdinr67afhdspc40f0c06xzmxbvc002"))))
-    (native-inputs
-     (modify-inputs (package-native-inputs python-django-3.2)
-       (prepend ;; 2.2 requires Selenium for the test suite.
-                python-selenium)))))
-
 ;; Use 3.2 LTS as the default until packages gain support for 4.x.
 (define-public python-django python-django-3.2)
 
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 16/57] gnu: datasette: Disabling failing tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:66a147f484113d29ed7c95137c854987cd04f546.1693991781.git.ngraves@ngraves.fr

* gnu/packages/databases.scm (datasette): Disabling failing tests.

---

gnu/packages/databases.scm | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (17 lines)diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 3d41649f4d..6cfe63c18e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5159,7 +5159,9 @@ (define-public datasette
                     " or test_table_with_slashes_in_name"
                     " or test_searchable"
                     " or test_custom_query_with_unicode_characters"
-                    " or test_searchmode)")
+                    " or test_searchmode"
+                    " or test_max_csv_mb" ;URL too long
+                    " or test_database_page)") ; assert async_hook -> hook
               "-n" (number->string (parallel-job-count))
               "-m" "not serial")        ;cannot run in parallel
       #:phases
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 18/57] gnu: python-django-contact-form: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:f7b1b3ea12d5f2c33d605c4b2fda6d28054c4a87.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-contact-form): Add native-input tzdata-for-tests.
[build-system]: Use pyproject-build-system.
---
 gnu/packages/django.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4531484073..ba08598e8c 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -805,7 +805,7 @@ (define-public python-django-contact-form
               (sha256
                (base32
                 "1my9hkrylckp5vfqg9b0kncrdlxjnwxll56sdciqn4v19i4wbq1y"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -814,7 +814,7 @@ (define-public python-django-contact-form
              (invoke "coverage" "run" "--source" "contact_form"
                      "runtests.py"))))))
     (native-inputs
-     (list python-coverage))
+     (list python-coverage tzdata-for-tests))
     (propagated-inputs
      (list python-django))
     (home-page "https://github.com/ubernostrum/django-contact-form")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 17/57] gnu: graphite-web: Update to 1.1.10-0-dca59dc.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:4226460e0f01130fa5e5530e432f5b9c36e65318.1693991781.git.ngraves@ngraves.fr

* gnu/packages/monitoring.scm (graphite-web): Update to 1.1.10-0-dca59dc.
[build-system]: Use pyproject-build-system.
[arguments](tests?): Enable tests.
(phases): Remove trailing #t.
[propagated-inputs]: Move from python-django-2.2 to python-django-3.2.
---
 gnu/packages/monitoring.scm | 80 +++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 39 deletions(-)

Toggle diff (95 lines)diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 3238f11fb4..1d77dbd75f 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -452,47 +452,49 @@ (define-public python-carbon
     (license license:asl2.0)))
 
 (define-public graphite-web
-  (package
-    (name "graphite-web")
-    (version "1.1.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "graphite-web" version))
-       (sha256
-        (base32
-         "1l5a5rry9cakqxamvlx4xq63jifmncb6815bg9vy7fg1zyd3pjxk"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:tests? #f               ;XXX: not in PyPI release & requires database
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'relax-requirements
-           (lambda _
-             (substitute* "setup.py"
-               ;; Allow newer versions of django-tagging.
-               (("django-tagging==")
-                "django-tagging>="))
-             #t))
-         ;; Don't install to /opt
-         (add-after 'unpack 'do-not-install-to-/opt
-           (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1") #t)))))
-    (propagated-inputs
-     (list python-cairocffi
-           python-pytz
-           python-whisper
-           python-django-2.2
-           python-django-tagging
-           python-scandir
-           python-urllib3
-           python-pyparsing
-           python-txamqp))
-    (home-page "https://graphiteapp.org/")
-    (synopsis "Scalable realtime graphing system")
-    (description "Graphite is a scalable real-time graphing system that does
+  (let ((commit "dca59dc72ae28ffdae659232c10c60aa598536eb")
+        (revision "0"))
+    (package
+      (name "graphite-web")
+      (version "1.1.10")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/graphite-project/graphite-web")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "06yzvg2r9lx92swp51k27qhxf178nq6y9px5kcmpv31ikc3nri7q"))))
+      (build-system pyproject-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'relax-requirements
+             (lambda _
+               (substitute* "setup.py"
+                 ;; Allow newer versions of django-tagging.
+                 (("django-tagging==")
+                  "django-tagging>="))))
+           ;; Don't install to /opt
+           (add-after 'unpack 'do-not-install-to-/opt
+             (lambda _ (setenv "GRAPHITE_NO_PREFIX" "1"))))))
+      (propagated-inputs
+       (list python-cairocffi
+             python-pytz
+             python-whisper
+             python-django-3.2
+             python-django-tagging
+             python-scandir
+             python-urllib3
+             python-pyparsing
+             python-txamqp))
+      (home-page "https://graphiteapp.org/")
+      (synopsis "Scalable realtime graphing system")
+      (description "Graphite is a scalable real-time graphing system that does
 two things: store numeric time-series data, and render graphs of this data on
 demand.")
-    (license license:asl2.0)))
+      (license license:asl2.0))))
 
 (define-public python-prometheus-client
   (package
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 19/57] gnu: python-django-contrib-comments: Update to 2.2.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:546b388b73962832f4668c59fc7d9c0ac4cfb695.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-contrib-comments): Update to 2.2.0.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add tzdata-for-tests.
[propagated-inputs]: Remove python-six.
---
 gnu/packages/django.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index ba08598e8c..7d4d1276dd 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -827,16 +827,18 @@ (define-public python-django-contact-form
 (define-public python-django-contrib-comments
   (package
     (name "python-django-contrib-comments")
-    (version "1.9.2")
+    (version "2.2.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-contrib-comments" version))
               (sha256
                (base32
-                "0ccdiv784a5vnpfal36km4dyg12340rwhpr0riyy0k89wfnjn8yi"))))
-    (build-system python-build-system)
+                "1njnfcmlg70icin160jpk8f3kr00drfj1zxf2si1dq3pavqh1pj8"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list tzdata-for-tests))
     (propagated-inputs
-     (list python-django python-six))
+     (list python-django))
     (home-page "https://github.com/django/django-contrib-comments")
     (synopsis "Comments framework")
     (description
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 20/57] gnu: python-dango-rq: Add native-input tzdata-for-tests.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:b7bd02b63d6ce5ec0f056aba92878df5ff5448f3.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-dango-rq): Add native-input tzdata-for-tests.
[build-system]: Use pyproject-builds-system.
---
 gnu/packages/django.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (25 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 7d4d1276dd..7a2dd2835c 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -928,7 +928,7 @@ (define-public python-django-rq
               (sha256
                (base32
                 "0aw0fi0lg80qgdp9fhjbnlhvfh2p09rgy1nj6hxpyhi37kihni2h"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -939,7 +939,8 @@ (define-public python-django-rq
                      "--settings=django_rq.tests.settings"
                      "--pythonpath=."))))))
     (native-inputs
-     (list python-django-redis python-mock python-rq-scheduler redis))
+     (list python-django-redis python-mock python-rq-scheduler redis
+           tzdata-for-tests))
     (propagated-inputs
      (list python-django python-rq))
     (home-page "https://github.com/ui/django-rq")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 21/57] gnu: python-django-sortedm2m: Replace input python-django by python-django-3.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:5dae2021f6fda417aa85a2350dce3926374cb09b.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-sortedm2m): Replace input python-django by python-django-3.2.

---

gnu/packages/django.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 7a2dd2835c..4978aa07c2 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -993,7 +993,7 @@ (define-public python-django-sortedm2m
                               "test" "--settings=test_project.settings"
                               "--pythonpath=."))))))
     (propagated-inputs
-     (list python-django))
+     (list python-django-3.2))
     (home-page "https://github.com/jazzband/django-sortedm2m")
     (synopsis "Drop-in replacement for django's own ManyToManyField")
     (description
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 22/57] gnu: python-django-tagging: Add patch for django@4 support.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:56003ceeb386b752ae9ee10f78b0675bdb484705.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-tagging): Add patch for django@4 support.
[source](patches): Add patch for django@4 support.
[native-inputs]: Add tzdata-for-tests.
* gnu/packages/patches/python-django-tagging-django-4-support.patch
---
 gnu/packages/django.scm                       |   7 +-
 ...thon-django-tagging-django-4-support.patch | 101 ++++++++++++++++++
 2 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/python-django-tagging-django-4-support.patch

Toggle diff (134 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4978aa07c2..11e4279829 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1073,8 +1073,9 @@ (define-public python-django-tagging
        (method url-fetch)
        (uri (pypi-uri "django-tagging" version))
        (sha256
-        (base32
-         "13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8"))))
+        (base32 "13afxx30chssclxzd9gqnvwm9qyrdpnlbs6iswdfa18phfj8zmi8"))
+       (patches
+        (search-patches "python-django-tagging-django-4-support.patch"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -1083,6 +1084,8 @@ (define-public python-django-tagging
            (lambda _
              (setenv "DJANGO_SETTINGS_MODULE" "tagging.tests.settings")
              (invoke "django-admin" "test" "--pythonpath=."))))))
+    (native-inputs
+     (list tzdata-for-tests))
     (inputs
      (list python-django))
     (home-page "https://github.com/Fantomas42/django-tagging")
diff --git a/gnu/packages/patches/python-django-tagging-django-4-support.patch b/gnu/packages/patches/python-django-tagging-django-4-support.patch
new file mode 100644
index 0000000000..bb51f072cf
--- /dev/null
+++ b/gnu/packages/patches/python-django-tagging-django-4-support.patch
@@ -0,0 +1,101 @@
+From ee42fd962c5abc7ed18f729ded42ee1f56397678 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado@kiwi.com>
+Date: Sun, 12 Dec 2021 18:13:23 +0100
+Subject: [PATCH 2/4] Use smart_str instead of deprecated smart_text Django
+ function
+
+---
+ tagging/models.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tagging/models.py b/tagging/models.py
+index 02550eec..d16a61ec 100644
+--- a/tagging/models.py
++++ b/tagging/models.py
+@@ -5,7 +5,7 @@
+ from django.contrib.contenttypes.models import ContentType
+ from django.db import connection
+ from django.db import models
+-from django.utils.encoding import smart_text
++from django.utils.encoding import smart_str
+ from django.utils.translation import gettext_lazy as _
+ 
+ from tagging import settings
+@@ -519,4 +519,4 @@ class Meta:
+         verbose_name_plural = _('tagged items')
+ 
+     def __str__(self):
+-        return '%s [%s]' % (smart_text(self.object), smart_text(self.tag))
++        return '%s [%s]' % (smart_str(self.object), smart_str(self.tag))
+
+From 9c47683ec67ad2fbf82f1dce6384b156f64f55bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado@kiwi.com>
+Date: Sun, 12 Dec 2021 18:14:35 +0100
+Subject: [PATCH 3/4] Use re_path instead of deprecated url Django function
+
+---
+ tagging/tests/urls.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tagging/tests/urls.py b/tagging/tests/urls.py
+index aa127d5f..7db3e7e1 100644
+--- a/tagging/tests/urls.py
++++ b/tagging/tests/urls.py
+@@ -1,5 +1,5 @@
+ """Test urls for tagging."""
+-from django.conf.urls import url
++from django.urls import re_path
+ 
+ from tagging.tests.models import Article
+ from tagging.views import TaggedObjectList
+@@ -11,10 +11,10 @@ class StaticTaggedObjectList(TaggedObjectList):
+ 
+ 
+ urlpatterns = [
+-    url(r'^static/$', StaticTaggedObjectList.as_view()),
+-    url(r'^static/related/$', StaticTaggedObjectList.as_view(
++    re_path(r'^static/$', StaticTaggedObjectList.as_view()),
++    re_path(r'^static/related/$', StaticTaggedObjectList.as_view(
+         related_tags=True)),
+-    url(r'^no-tag/$', TaggedObjectList.as_view(model=Article)),
+-    url(r'^no-query-no-model/$', TaggedObjectList.as_view()),
+-    url(r'^(?P<tag>[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)),
++    re_path(r'^no-tag/$', TaggedObjectList.as_view(model=Article)),
++    re_path(r'^no-query-no-model/$', TaggedObjectList.as_view()),
++    re_path(r'^(?P<tag>[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)),
+ ]
+
+From 6550f6c04c0d2d67049e8cc3263623811207c66d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?=
+ <bartolome.salado@kiwi.com>
+Date: Sun, 12 Dec 2021 18:26:03 +0100
+Subject: [PATCH 4/4] Add support for Django 4 compatibility
+
+---
+ tagging/models.py | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/tagging/models.py
++++ b/tagging/models.py
+@@ -5,6 +5,7 @@
+ from django.contrib.contenttypes.models import ContentType
+ from django.db import connection
+ from django.db import models
++from django.db.models.query_utils import Q
+ from django.utils.encoding import smart_str
+ from django.utils.translation import gettext_lazy as _
+ 
+@@ -155,8 +156,9 @@ def usage_for_model(self, model, counts=False, min_count=None,
+             filters = {}
+ 
+         queryset = model._default_manager.filter()
+-        for f in filters.items():
+-            queryset.query.add_filter(f)
++        for k, v in filters.items():
++            # Add support for both Django 4 and inferior versions
++            queryset.query.add_q(Q((k, v)))
+         usage = self.usage_for_queryset(queryset, counts, min_count)
+ 
+         return usage
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 23/57] gnu: python-django-sortedm2m: Update to 3.1.1-0-ddf321f.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:574033b800e3e5d50bee3be69ea58a9917614e60.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-sortedm2m): Update to 3.1.1-0-ddf321f.
[build-system]: Use pyproject-build-system.
[arguments](tests?): Disable tests.
(phases): Execute phase 'check command when tests?.
[native-inputs]: Add python-psycopg2.
---
 gnu/packages/django.scm | 58 ++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 24 deletions(-)

Toggle diff (73 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 11e4279829..00a83ab06d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -975,32 +975,42 @@ (define-public python-django-q
     (license license:expat)))
 
 (define-public python-django-sortedm2m
-  (package
-    (name "python-django-sortedm2m")
-    (version "3.0.2")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "django-sortedm2m" version))
-              (sha256
-               (base32
-                "0z0yymmrr2l5cznqbzwziw624df0qsiflvbpqwrpan52nww3dk4a"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (invoke "django-admin"
-                              "test" "--settings=test_project.settings"
-                              "--pythonpath=."))))))
-    (propagated-inputs
-     (list python-django-3.2))
-    (home-page "https://github.com/jazzband/django-sortedm2m")
-    (synopsis "Drop-in replacement for django's own ManyToManyField")
-    (description
-      "Sortedm2m is a drop-in replacement for django's own ManyToManyField.
+  (let ((commit "ddf321fc9736b9a9477d496c60250270111cf2ce")
+        (revision "0"))
+    (package
+      (name "python-django-sortedm2m")
+      (version (git-version "3.1.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/jazzband/django-sortedm2m")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1j08xyvlc5dypd26p48v0dj3k5g5ssrygvdy8zgg64g3iw8sw7v3"))))
+      (build-system pyproject-build-system)
+      (arguments
+       `(#:tests? #f ; require a running postgresql server
+         #:phases
+         (modify-phases %standard-phases
+           (replace 'check
+             (lambda* (#:key tests? #:allow-other-keys)
+               (when tests?
+                 (invoke "django-admin"
+                         "test" "--settings=test_project.settings"
+                         "--pythonpath=.")))))))
+      (native-inputs
+       (list python-psycopg2))
+      (propagated-inputs
+       (list python-django))
+      (home-page "https://github.com/jazzband/django-sortedm2m")
+      (synopsis "Drop-in replacement for django's own ManyToManyField")
+      (description
+       "Sortedm2m is a drop-in replacement for django's own ManyToManyField.
 The provided SortedManyToManyField behaves like the original one but remembers
 the order of added relations.")
-    (license license:bsd-3)))
+      (license license:bsd-3))))
 
 (define-public python-django-appconf
   (package
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 24/57] gnu: python-defusedxml: Update to 0.7.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:2345d0f7b9a53e69a0ba0306b8cf8dab4705dde9.1693991781.git.ngraves@ngraves.fr

* gnu/packages/xml.scm (python-defusedxml): Update to 0.7.0.

---

gnu/packages/xml.scm | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 01e48fda57..5baa48d0ff 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1441,14 +1441,13 @@ (define-public xlsx2csv
 (define-public python-defusedxml
   (package
     (name "python-defusedxml")
-    (version "0.6.0")
+    (version "0.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "defusedxml" version))
        (sha256
-        (base32
-         "1xbp8fivl3wlbyg2jrvs4lalaqv1xp9a9f29p75wdx2s2d6h717n"))))
+        (base32 "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6"))))
     (build-system python-build-system)
     (home-page "https://bitbucket.org/tiran/defusedxml")
     (synopsis "XML bomb protection for Python stdlib modules")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 25/57] gnu: python-filetype: Update to 1.0.10.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:1fe4a834908285fdae27eee4f804c7a6a18782eb.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-filetype): Update to 1.0.10.

---

gnu/packages/python-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a950de3b46..138ce97fc7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14125,13 +14125,13 @@ (define-public python-get-version
 (define-public python-filetype
   (package
     (name "python-filetype")
-    (version "1.0.8")
+    (version "1.0.10")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "filetype" version))
        (sha256
-        (base32 "05mkinkcn36v1cnb5hzay3zxmv7jmmflckxxp08rgzbkkf3i9pvp"))))
+        (base32 "0dz9kafvd2lnzl7vd40ylzxnv9g9ph5r7hrv4mdcddii0x816fij"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 26/57] gnu: python-rcssmin: Update to 1.1.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:d8c0badd6afcff6b9d247f805b5d2a6ea617af0b.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-rcssmin): Update to 1.1.1.
[build-system]: Use pyproject-build-system.
[arguments]: Delete #:phases.
[native-inputs]: Add python-pytest.
---
 gnu/packages/python-xyz.scm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 138ce97fc7..847e3bcc3b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20916,21 +20916,16 @@ (define-public python-csscompressor
 (define-public python-rcssmin
   (package
     (name "python-rcssmin")
-    (version "1.0.6")
+    (version "1.1.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "rcssmin" version))
-        (sha256
-         (base32
-          "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _
-             (invoke "python" "run_tests.py" "tests"))))))
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "rcssmin" version))
+       (sha256
+        (base32 "0r6w2g26m7sy25rhqx2rda737a5g962yfn3g8kszaabd6ss0152g"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-pytest))
     (home-page "http://opensource.perlig.de/rcssmin/")
     (synopsis "CSS Minifier")
     (description "The minifier is based on the semantics of the YUI compressor,
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 27/57] gnu: python-rjsmin: Update to 1.2.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:1ec21bb4162a529d719a7eec02ed2d21fbd0c4b0.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-rjsmin): Update to 1.2.1.
[source](snippet): Remove trailing #t.
[build-system]: Use pyproject-build-sytem.
[description]: Fix spacing.
[arguments]: Delete #:phases and #:tests?.
---
 gnu/packages/python-xyz.scm | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

Toggle diff (52 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 847e3bcc3b..c1237725b3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20935,38 +20935,26 @@ (define-public python-rcssmin
 (define-public python-rjsmin
   (package
     (name "python-rjsmin")
-    (version "1.1.0")
+    (version "1.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "rjsmin" version))
         (sha256
-         (base32
-          "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi"))
+         (base32 "04almyw2b5r9xq9961qgzhskjjhk82djf1s3m5vqfhqiw3l2p60z"))
         (modules '((guix build utils)))
         (snippet
          '(begin
-            (for-each delete-file (find-files "bench" "\\.js$"))
-            #t))))
-    (build-system python-build-system)
-    (arguments
-     '(#:tests? #f  ; Not all test files included.
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (if tests?
-               (invoke "py.test" "-vv" "tests")
-               #t))))))
+            (for-each delete-file (find-files "bench" "\\.js$"))))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest))
     (home-page "http://opensource.perlig.de/rjsmin/")
     (synopsis "Javascript Minifier")
     (description "@code{rJSmin} is a javascript minifier written in Python.  The
-     minifier is based on the semantics of jsmin.c by Douglas Crockford.  The module
-     is a re-implementation aiming for speed, so it can be used at runtime (rather
-                                                                            than during a preprocessing step).")
+minifier is based on the semantics of jsmin.c by Douglas Crockford.  The module
+is a re-implementation aiming for speed, so it can be used at runtime (rather
+than during a preprocessing step).")
     (license license:asl2.0)))
 
 (define-public python-xopen
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 28/57] gnu: python-django-mailman3: Update to 1.3.8.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:b13afcbed8c403484872e5d0c81ef9132ca3c72b.1693991781.git.ngraves@ngraves.fr

* gnu/packages/mail.scm (python-django-mailman3): Update to 1.3.8.
[build-system]: Use pyproject-build-system.
[arguments](phases): Set DJANGO_SETTINGS_MODULE in the invoke call.
[native-inputs]: Add tzdata-for-tests.
---
 gnu/packages/mail.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ecaab1c7cd..b34dc306d2 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3546,29 +3546,28 @@ (define-public mlmmj
 (define-public python-django-mailman3
   (package
     (name "python-django-mailman3")
-    (version "1.3.7")
+    (version "1.3.8")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "django-mailman3" version))
         (sha256
-         (base32
-          "1dzycnwdr1gavs1dgmcv1lz24x0fkp8y864fy52fgbz72d6c5a3f"))))
-    (build-system python-build-system)
+         (base32 "0ma4q6ffyz2qhlg3cw0kbxsvwli41154p1zgv5h93l3r0s4p4xhb"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
-             (setenv "DJANGO_SETTINGS_MODULE"
-                     "django_mailman3.tests.settings_test")
-             (invoke "django-admin" "test"
-                     "--pythonpath=."))))))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "django-admin" "test"
+                     "--settings=django_mailman3.tests.settings_test"
+                     "--pythonpath=.")))))))
     (propagated-inputs
      (list python-django python-django-allauth python-django-gravatar2
            python-mailmanclient python-pytz))
     (native-inputs
-     (list python-mock))
+     (list python-mock tzdata-for-tests))
     (home-page "https://gitlab.com/mailman/django-mailman3")
     (synopsis "Django library to help interaction with Mailman")
     (description
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 29/57] gnu: Remove python-pysolr.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:c62c389b05b8c0f37e138630728435a9afc42ff9.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-web.scm (python-pysolr): Delete variable.

---

gnu/packages/python-web.scm | 25 -------------------------

1 file changed, 25 deletions(-)

Toggle diff (38 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 78ab265603..c073793544 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6737,31 +6737,6 @@ (define-public python-robot-detection
 @url{http://www.robotstxt.org}.")
     (license license:gpl3+)))
 
-(define-public python-pysolr
-  (package
-    (name "python-pysolr")
-    (version "3.9.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "pysolr" version))
-        (sha256
-         (base32
-          "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:tests? #f)) ; Tests require network access.
-    (propagated-inputs
-     (list python-requests))
-    (native-inputs
-     (list python-setuptools-scm))
-    (home-page "https://github.com/django-haystack/pysolr/")
-    (synopsis "Lightweight python wrapper for Apache Solr")
-    (description
-     "This module provides an interface that queries the Apache Solr server
-using a pure Python implementation.")
-    (license license:bsd-3)))
-
 (define-public python-pyjsparser
   (package
     (name "python-pyjsparser")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 30/57] gnu: python-django-compressor: Update to 4.3.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:3f885f6e4a65e18ebb5c9e24118f1d11c1a0e449.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-compressor): Update to 4.3.1.
[build-system]: Use pyproject-build-system.
[arguments](phases): Set DJANGO_SETTINGS_MODULE in the invoke call and adapt
phase 'check to argument test-flags.
(test-flags): Add argument.
(tests?) : Delete argument.
---
 gnu/packages/django.scm | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 00a83ab06d..008c5a44f2 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1197,28 +1197,25 @@ (define-public python-django-crispy-forms
 (define-public python-django-compressor
   (package
     (name "python-django-compressor")
-    (version "2.4.1")
+    (version "4.3.1")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "django_compressor" version))
-        (sha256
-         (base32 "1q0m0hfg7sqmj5km924g4dgy3nx51aszzsprlp6gsin10mv0fn1k"))))
-    (build-system python-build-system)
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django_compressor" version))
+       (sha256
+        (base32 "0hl9bwdiif6pn37fw2fpm56i3vcapb1qcb82kb19q2fclq6qr1b8"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
+     '(#:test-flags '("-k" "not test_clamjs_filter")
+       #:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
              (if tests?
-               (begin
-                 (setenv "DJANGO_SETTINGS_MODULE" "compressor.test_settings")
-                 (invoke "django-admin" "test"
-                         "--pythonpath=."))
-               #t))))
-       ;; Tests fail with beautifulsoup 4.9+
-       ;; https://github.com/django-compressor/django-compressor/issues/998
-       #:tests? #f))
+                 (apply invoke "django-admin" "test"
+                        "--pythonpath=." "--settings=compressor.test_settings"
+                        test-flags)
+                 (format #t "test suite not run~%")))))))
     (propagated-inputs
      (list python-django-appconf python-rcssmin python-rjsmin))
     (native-inputs
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 31/57] gnu: python-django-haystack: Update to 3.2.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:ce615f4779d708a03b237deb287da3b0953e045a.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-haystack): Update to 3.2.1.
[build-system]: Use pyproject-build-system.
[arguments](phases): Delete phase loosen-version-restrictions. Extend and
rename phase set-gdal-lib-path to set-lib-path, add phase check.
(tests?): Delete argument.
[native-inputs]: Add geos. Delete python-pysolr.
---
 gnu/packages/django.scm | 60 ++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 16 deletions(-)

Toggle diff (93 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 008c5a44f2..0bcac0c07a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -473,34 +473,63 @@ (define-public python-pytest-django
 (define-public python-django-haystack
   (package
     (name "python-django-haystack")
-    (version "3.1.1")
+    (version "3.2.1")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "django-haystack" version))
         (sha256
-         (base32
-          "10kaa5641cakpra2x3jqgys085gdkjcyns26plfyrmfpjmmpa1bd"))))
-    (build-system python-build-system)
+         (base32 "194kf9ps1h8bq8q32x6nniy85grl4l5605vgbd0gw9f2xxx1kqwp"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'loosen-verion-restrictions
-           (lambda _
-             (substitute* "setup.py"
-               (("geopy.*") "geopy\",\n"))))
-         (add-before 'check 'set-gdal-lib-path
+         (add-before 'check 'set-lib-path
            (lambda* (#:key inputs #:allow-other-keys)
-             (setenv "GDAL_LIBRARY_PATH"
-                     (string-append (assoc-ref inputs "gdal")
-                                    "/lib"))))
+             (setenv "LD_LIBRARY_PATH"
+                     (string-append
+                      (assoc-ref inputs "gdal") "/lib"
+                      ":" (assoc-ref inputs "geos") "/lib"))))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (begin
+                 ;; Delete absent elasticsearch tests.
+                 (delete-file-recursively "test_haystack/elasticsearch_tests")
+                 (delete-file-recursively "test_haystack/elasticsearch2_tests")
+                 (delete-file-recursively "test_haystack/elasticsearch5_tests")
+                 (delete-file-recursively "test_haystack/elasticsearch7_tests")
+                 ;; Solr tests require a running solr server.
+                 ;; Deactivating solr.
+                 (delete-file-recursively "test_haystack/solr_tests")
+                 (delete-file "haystack/backends/solr_backend.py")
+                 (delete-file
+                  "haystack/management/commands/build_solr_schema.py")
+                 (delete-file
+                  "test_haystack/test_altered_internal_names.py")
+                 (delete-file "test_haystack/multipleindex/tests.py")
+                 (delete-file "test_haystack/spatial/test_spatial.py")
+                 (substitute* "test_haystack/test_loading.py"
+                   (("class ConnectionHandlerTestCase" all)
+                    (string-append
+                     "\nfrom nose.plugins.attrib import attr"
+                     "\n@attr('skip')"
+                     "\n" all)))
+                 (substitute* "test_haystack/settings.py"
+                   (("\"solr\":")
+                    (string-append
+                     "\"solr\": {\"ENGINE\": \"test_haystack.mocks.MockEngine\"}}"
+                     "\n_={\"solr\":")))
+                 ;; Run tests.
+                 (invoke "django-admin"
+                         "test" "--settings=test_haystack.settings"
+                         "--pythonpath=.")))))
          ;; Importing this module requires setting up a Django project.
-         (delete 'sanity-check))
-       #:tests? #f)) ; OSError: libgdal.so.27: cannot open shared object file
+              (delete 'sanity-check))))
     (propagated-inputs
      (list python-django))
     (native-inputs
-     (list gdal
+     (list gdal geos
            python-coverage
            python-dateutil
            python-geopy
@@ -508,7 +537,6 @@ (define-public python-django-haystack
            python-nose
            python-requests
            python-setuptools-scm
-           python-pysolr
            python-whoosh))
     (home-page "https://haystacksearch.org/")
     (synopsis "Pluggable search for Django")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 33/57] gnu: Add python-django-requests-debug-toolbar.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:65c68c29a93eee7da25dba2a564d76b94755148a.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-requests-debug-toolbar): New variable.

---

gnu/packages/django.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (34 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 0bcac0c07a..548c36acfd 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -308,6 +308,27 @@ (define-public python-django-localflavor
 that are useful for particular countries or cultures.")
     (license license:bsd-3)))
 
+(define-public python-django-requests-debug-toolbar
+  (package
+    (name "python-django-requests-debug-toolbar")
+    (version "0.0.5")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "django-requests-debug-toolbar" version))
+              (sha256
+               (base32
+                "0y08hnziblz0m9y0pfv2ibm0dchmw85hqaj49f56a3bh330qavdb"))))
+    (build-system pyproject-build-system)
+    (arguments
+     '(#:tests? #f)) ; no tests.
+    (propagated-inputs (list python-django-debug-toolbar))
+    (home-page
+     "https://github.com/marceltschoppch/django-requests-debug-toolbar")
+    (synopsis "Django Debug Toolbar panel for Requests")
+    (description
+     "This package provides a Django Debug Toolbar panel for Requests.")
+    (license license:expat)))
+
 (define-public python-django-simple-math-captcha
   (let ((commit "61adb4f43bfc654da61fa7b84ea4f455e31f0bd2")
         (revision "0"))
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 34/57] gnu: postorius: Update to 1.3.7.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:6625cee75c43e78d8680141f8b0eb2b6ced0639c.1693991781.git.ngraves@ngraves.fr

* gnu/packages/mail.scm (postorius): Update to 1.3.7.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-django-requests-debug-toolbar.
---
 gnu/packages/mail.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 19347dc63e..b67180f505 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3657,15 +3657,14 @@ (define-public python-hyperkitty
 (define-public postorius
   (package
     (name "postorius")
-    (version "1.3.6")
+    (version "1.3.7")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "postorius" version))
        (sha256
-        (base32
-         "0s0sv97nmszl5pl9rnnyzp3sxpmdhpxqrdwv7nc0ww8zs99w831b"))))
-    (build-system python-build-system)
+        (base32 "1w520df39krrkxhyppyhgg3zzfrzvg90wcjxxgyw1pmz4p8ajh1x"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -3675,13 +3674,14 @@ (define-public postorius
              (if tests?
                  (invoke "python" "example_project/manage.py" "test"
                          "--settings=test_settings" "postorius")
-                 #t))))
+                 (format #t "test suite not run~%")))))
        #:tests? #f)) ; Tests try to run a mailman instance to test against.
     (inputs
      (list python-readme-renderer python-mailmanclient
            python-django python-django-mailman3))
     (native-inputs
-     (list python-beautifulsoup4 python-isort python-mock python-vcrpy))
+     (list python-beautifulsoup4 python-isort python-mock python-vcrpy
+           python-django-requests-debug-toolbar))
     (home-page "https://gitlab.com/mailman/postorius")
     (synopsis "Web user interface for GNU Mailman")
     (description
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 35/57] gnu: python-django-rest-framework: Update to 3.14.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:5b24b949fdf9a1aead91be2a54357a763531a678.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-rest-framework): Update to 3.14.0.
[build-system]: Use pyproject-build-system.
[arguments]: Delete phases.
---
 gnu/packages/django.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 548c36acfd..00b1c65666 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1157,7 +1157,7 @@ (define-public python-django-tagging
 (define-public python-django-rest-framework
   (package
     (name "python-django-rest-framework")
-    (version "3.13.1")
+    (version "3.14.0")
     (source
      (origin
        (method git-fetch)
@@ -1166,17 +1166,8 @@ (define-public python-django-rest-framework
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "11wfb156yin6mlgcdzfmi267jsq1cld131mxgd13aqsrj06zlray"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? inputs #:allow-other-keys)
-             (if tests?
-                 (invoke "python" "runtests.py")
-                 (format #t "test suite not run~%")))))))
+        (base32 "0gipd74hc58wxfi4wq37saygvphk1dlrh4jw7anjgpajffgz8y0n"))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest python-pytest-django tzdata-for-tests))
     (propagated-inputs
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 36/57] gnu: python-django: Update default version to 4.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:56ed9d5351e56ad582342424f2f38dd129196845.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django): Update default version to 4.0.

---

gnu/packages/django.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 00b1c65666..717a56deb4 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -214,7 +214,7 @@ (define-public python-django-3.1.14
        (append python-asgiref-3.4.1)))))
 
 ;; Use 3.2 LTS as the default until packages gain support for 4.x.
-(define-public python-django python-django-3.2)
+(define-public python-django python-django-4.0)
 
 (define-public python-django-extensions
   (package
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:15

[PATCH v7 32/57] gnu: python-hyperkitty: Update to 1.3.7.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:992d71db0e42eaa52fe11e5eb434c5d8ed4007ae.1693991781.git.ngraves@ngraves.fr

* gnu/packages/mail.scm (python-hyperkitty): Update to 1.3.7.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-django-debug-toolbar, tzdata-for-tests.
---
 gnu/packages/mail.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Toggle diff (44 lines)diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index b34dc306d2..19347dc63e 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3605,15 +3605,14 @@ (define-public python-mailman-hyperkitty
 (define-public python-hyperkitty
   (package
     (name "python-hyperkitty")
-    (version "1.3.5")
+    (version "1.3.7")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "HyperKitty" version))
-        (sha256
-         (base32
-          "11lz1s2p8n43h1cdr9l5dppsigg8qdppckdwdndzn7a8r8mj4sc2"))))
-    (build-system python-build-system)
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "HyperKitty" version))
+       (sha256
+        (base32 "1jq2h7fgrnyfkgk8j2hxa67jjbirfb79wcv2r90nfm1hxjisqx2d"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -3640,11 +3639,13 @@ (define-public python-hyperkitty
            python-robot-detection))
     (native-inputs
      (list python-beautifulsoup4
+           python-django-debug-toolbar
            python-elasticsearch
            python-isort
            python-lxml
            python-mock
-           python-whoosh))
+           python-whoosh
+           tzdata-for-tests))
     (home-page "https://gitlab.com/mailman/hyperkitty")
     (synopsis "Web interface to access GNU Mailman v3 archives")
     (description
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 37/57] gnu: python-django-taggit: Update to 3.1.0.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:b66bc0572024e2f71ecb93485ce0b438e06d11f4.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-taggit): Update to 3.1.0.
[build-sytem] Use pyproject-build-system.
[propagated-inputs] Add python-sqlparse.
[native-inputs] Add python-django-rest-framework. Remove python-pytest,
python-mock.
[synopsis] Simpler synopsis.
[description] More precise description.
---
 gnu/packages/django.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 717a56deb4..a9e8ecb392 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
 ;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
+;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,7 @@ (define-module (gnu packages django)
   #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix deprecation)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -391,15 +393,14 @@ (define-public python-django-classy-tags
 (define-public python-django-taggit
   (package
     (name "python-django-taggit")
-    (version "1.3.0")
+    (version "3.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-taggit" version))
        (sha256
-        (base32
-         "0bbkabbs77z229ps0800gxfhf75yagp4x4j5jzfysbac3zvkp0sa"))))
-    (build-system python-build-system)
+        (base32 "024mwbapzy421sfwws60f04qh2709631spfpnf4r14w7wgmf9wn8"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -407,15 +408,17 @@ (define-public python-django-taggit
            (lambda _
              (invoke "python3" "-m" "django" "test" "--settings=tests.settings"))))))
     (propagated-inputs
-     (list python-django python-isort))
+     (list python-django python-isort python-sqlparse))
     (native-inputs
-     (list python-pytest python-mock))
+     (list python-django-rest-framework
+           tzdata-for-tests))
     (home-page
      "https://github.com/jazzband/django-taggit")
     (synopsis
-     "Reusable Django application for simple tagging")
+     "Django application for simple tagging")
     (description
-     "Django-taggit is a reusable Django application for simple tagging.")
+     "This package provides @code{django-taggit}, a reusable Django
+application for simple tagging.")
     (license license:bsd-3)))
 
 (define-public python-easy-thumbnails
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 38/57] gnu: python-django-filter: Update to 22.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:462ba818b35e40a51a21ac0b64d24fd03a1ca9d0.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-filter): Update to 22.1.
[build-sytem] Use pyproject-build-system.
[synopsis] Simpler synopsis.
[description] More precise description.
---
 gnu/packages/django.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index a9e8ecb392..93cf44d38c 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -573,14 +573,14 @@ (define-public python-django-haystack
 (define-public python-django-filter
   (package
     (name "python-django-filter")
-    (version "2.3.0")
+    (version "22.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-filter" version))
               (sha256
                (base32
-                "1bz5qzdk9pk4a2lp2yacrdnqmkv24vxnz4k3lykrnpc3b7bkvrhi"))))
-    (build-system python-build-system)
+                "19abb7ikcjxfwggjh0bx40sx2dpv7q60bchva6r86zjgx1v3nizd"))))
+    (build-system pyproject-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -592,12 +592,12 @@ (define-public python-django-filter
            python-django-crispy-forms python-mock
            tzdata-for-tests))
     (home-page "https://django-filter.readthedocs.io/en/latest/")
-    (synopsis "Reusable Django application to filter querysets dynamically")
+    (synopsis "Django application filtering querysets dynamically")
     (description
-     "Django-filter is a generic, reusable application to alleviate writing
-some of the more mundane bits of view code.  Specifically, it allows users to
-filter down a queryset based on a model’s fields, displaying the form to let
-them do this.")
+     "This package provides @code{django-filter}, a generic and
+reusable application to alleviate writing some of the more mundane bits of
+view code.  Specifically, it allows users to filter down a queryset based on a
+model’s fields, displaying the form to let them do this.")
     (license license:bsd-3)))
 
 (define-public python-django-allauth
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 40/57] gnu: Add python-django-treebeard.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:f6fd98c3e763873212f2de132cde708c550cf5d0.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-treebeard): New variable.

---

gnu/packages/django.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b7f7391df1..7aaca66b7d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -421,6 +421,34 @@ (define-public python-django-taggit
 application for simple tagging.")
     (license license:bsd-3)))
 
+(define-public python-django-treebeard
+  (package
+    (name "python-django-treebeard")
+    (version "4.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-treebeard" version))
+       (sha256
+        (base32 "12s6xyiyjvxnjdbnbj9wab5mdj69d1aj77lkfzmj9mbp0823baw4"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs (list python-django
+                             python-sqlparse))
+    (native-inputs (list python-wheel
+                         python-pytest-django))
+    (home-page "https://github.com/django-treebeard/django-treebeard/")
+    (synopsis "Efficient tree implementations for Django")
+    (description
+     "This package provides @code{django-treebeard}, an efficient tree
+implementations for Django.  It includes 3 different tree implementations
+with the same API:
+@itemize
+@item Adjacency List
+@item Materialized Path
+@item Nested Sets
+@end itemize")
+    (license license:bsd-3)))
+
 (define-public python-easy-thumbnails
   (package
     (name "python-easy-thumbnails")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 39/57] gnu: Add python-django-modelcluster.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:09e9df8cebbff529a399ff649ee1cf3e319eaab8.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-modelcluster): New variable.

---

gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (47 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 93cf44d38c..b7f7391df1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -900,6 +900,40 @@ (define-public python-django-contrib-comments
 entries, photos, book chapters, or anything else.")
     (license license:bsd-3)))
 
+(define-public python-django-modelcluster
+  (package
+    (name "python-django-modelcluster")
+    (version "6.0")
+    ;; tests are not packaged in pypi
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wagtail/django-modelcluster")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "19xskhh2wvl696jmji54b1p70kjbcxzwmw3v5ic54ifn8cx6za57"))))
+    (build-system pyproject-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "runtests.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-django python-pytz))
+    (native-inputs
+     (list python-django-taggit tzdata-for-tests))
+    (home-page "https://github.com/wagtail/django-modelcluster")
+    (synopsis "Django extension to allow working with clusters of models as a
+single unit")
+    (description
+     "This package provides a Django extension to allow working with
+clusters of models as a single unit, independently of the database.")
+    (license license:bsd-3)))
+
 (define-public python-django-pipeline
   (package
     (name "python-django-pipeline")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 41/57] gnu: Add python-parsy.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:ba4b6ab2e6a2b9ebd380c0470b0116c37442bfde.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-parsy): New variable.

---

gnu/packages/python-xyz.scm | 18 ++++++++++++++++++

1 file changed, 18 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c1237725b3..32666281c8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4025,6 +4025,24 @@ (define-public python-parsley
 language.")
     (license license:expat)))
 
+(define-public python-parsy
+  (package
+    (name "python-parsy")
+    (version "1.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "parsy" version))
+       (sha256
+        (base32 "00pkd1irxp1c9mcg3x1k3ny8jl7w5jfxp45ky0qp9s90wmri6hbw"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pytest python-attrs))
+    (home-page "https://github.com/python-parsy/parsy")
+    (synopsis "Parsing in pure Python")
+    (description "This package provides easy-to-use parser combinators, for
+parsing in pure Python.")
+    (license license:expat)))
+
 (define-public python-polib
   (package
     (name "python-polib")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 42/57] gnu: Add python-jinjalint.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:b0a5844d326b17fa7e2212f1b98cd44837acdbd3.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-jinjalint): New variable.

---

gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++

1 file changed, 39 insertions(+)

Toggle diff (52 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 32666281c8..b40f711d72 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5549,6 +5549,45 @@ (define-public python-pysdl2
 common SDL2 functionality.")
     (license license:cc0)))
 
+(define-public python-jinjalint
+  (package
+    (name "python-jinjalint")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jinjalint" version))
+       (sha256
+        (base32 "09qqqi6iggr64zms9j9sgfq9v5samvsqyyqk0s1y4gfjy6lf9424"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-build
+           (lambda _
+             ;; Lift requirements.
+             (substitute* "requirements.txt"
+               (("parsy==1.1.0.*") "parsy\n")
+               (("attrs==17.2.*") "attrs\n")
+               (("docopt==0.6.2.*") "docopt\n"))
+             ;; Python 3.10 support.
+             (substitute* "jinjalint/util.py"
+               (("import collections")
+                "from collections.abc import Iterable")
+               (("collections\\.Iterable")
+                "Iterable"))))
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python3" "-m" "jinjalint" "jinjalint/test.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-attrs python-docopt python-parsy))
+    (home-page "https://github.com/motet-a/jinjalint")
+    (synopsis "Linter for Jinja-like templates")
+    (description "This package provides @code{jinjalint} a linter for
+Jinja-like templates in Python.")
+    (license license:expat)))
+
 (define-public python-pystache
   (package
     (name "python-pystache")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 43/57] gnu: Add python-willow.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:e15e4e15920fca45dcb07eb2a0e4162a5d552caa.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-willow): New variable.

---

gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b40f711d72..e23d21d2bc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8833,6 +8833,32 @@ (define-public python-pixelmatch
 metrics.")
     (license license:isc)))
 
+(define-public python-willow
+  (package
+    (name "python-willow")
+    (version "1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Willow" version))
+       (sha256
+        (base32 "12k5mv9jh0f5vjm87ss4d7kbkrcb3n5fa0gk9pvf9n3jk3d2rr1z"))))
+    (build-system pyproject-build-system)
+    (inputs
+     (list freetype lcms libjpeg-turbo libtiff libwebp openjpeg zlib))
+    (propagated-inputs
+     (list python-defusedxml python-filetype))
+    (home-page "https://github.com/wagtail/Willow")
+    (synopsis
+     "Combine multiple Python image libraries into one API")
+    (description
+     "Willow is a simple image library that combines the APIs of Pillow, Wand
+and OpenCV.  It converts the image between the libraries when necessary.
+Willow currently has basic resize and crop operations, face and feature
+detection and animated GIF support.  New operations and library integrations
+can also be easily implemented.")
+    (license license:bsd-3)))
+
 (define-public python-imagecodecs
   (package
     (name "python-imagecodecs")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 45/57] gnu: Add python-django-environ.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:d7fb1c6abd873a48ff4297efa416a043ed08c8ab.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-environ): New variable.

---

gnu/packages/django.scm | 19 +++++++++++++++++++

1 file changed, 19 insertions(+)

Toggle diff (32 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 9c5460f788..3f280ab233 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -218,6 +218,25 @@ (define-public python-django-3.1.14
 ;; Use 3.2 LTS as the default until packages gain support for 4.x.
 (define-public python-django python-django-4.0)
 
+(define-public python-django-environ
+  (package
+    (name "python-django-environ")
+    (version "0.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-environ" version))
+       (sha256
+        (base32 "09bjlzvi6avaa0cwjvfz5ihjqxv44f3ys70ckr57g7cw8f8rlmdk"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-coverage python-pytest))
+    (home-page "https://django-environ.readthedocs.io")
+    (synopsis
+     "Use environment variables to configure your Django application")
+    (description "This package provides 12factor inspired environment
+variables to configure your Django application.")
+    (license license:expat)))
+
 (define-public python-django-extensions
   (package
     (name "python-django-extensions")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 44/57] gnu: Add python-django-request.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:812cce0bdef26febf9ec83f6a84e80888c5a46c6.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-request): New variable.

---

gnu/packages/django.scm | 37 +++++++++++++++++++++++++++++++++++++

1 file changed, 37 insertions(+)

Toggle diff (50 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 7aaca66b7d..9c5460f788 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -310,6 +310,43 @@ (define-public python-django-localflavor
 that are useful for particular countries or cultures.")
     (license license:bsd-3)))
 
+(define-public python-django-request
+  (package
+    (name "python-django-request")
+    (version "1.6.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/django-request/django-request")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1hncmcxral2h51jrgvzlhwqk37xyq7wjbf79hh4ik13prigxabwi"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "runtests.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs
+     (list python-dateutil python-django python-six))
+    (native-inputs
+     (list python-sqlparse python-mock
+           tzdata-for-tests))
+    (home-page "https://django-request.readthedocs.io")
+    (synopsis
+     "Statistics module for django")
+    (description
+     "This package provides a statistics module for django.  It stores
+requests in a database for admins to see, it can also be used to get
+statistics on who is online etc.")
+    (license license:expat)))
+
 (define-public python-django-requests-debug-toolbar
   (package
     (name "python-django-requests-debug-toolbar")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 46/57] gnu: Add python-draftjs-exporter.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:213de4132414b7ff1a217eee4fcc94b0c229ca86.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-draftjs-exporter): New variable.

---

gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++

1 file changed, 36 insertions(+)

Toggle diff (49 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e23d21d2bc..71a0c581c9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9618,6 +9618,42 @@ (define-public python-decorator
 etc.  The core of this module is a decorator factory.")
     (license license:expat)))
 
+(define-public python-draftjs-exporter
+  (package
+    (name "python-draftjs-exporter")
+    (version "2.1.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/springload/draftjs_exporter")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1k9bc2rpdygrch66vig6pkc2hpbi3xprsspaccf8qx6h37sjn3dp"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-beautifulsoup4
+                         python-html5lib
+                         python-lxml))
+    (arguments
+     `(#:test-flags '("-m" "unittest" "discover"
+                      ;; FIXME disabling two unexpected failing tests
+                      "-k" "not test_export_lxml_big_content_export"
+                      "-k" "not test_export_lxml_entity_with_data-*")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
+             (if tests?
+                 (apply invoke "python" test-flags)
+                 (format #t "test suite not run~%")))))))
+    (home-page "https://github.com/springload/draftjs_exporter")
+    (synopsis
+     "Library to convert rich text from Draft.js raw ContentState to HTML")
+    (description
+     "This package provides a python library to convert rich text from Draft.js raw
+ContentState to HTML.")
+    (license license:expat)))
 
 (define-public python-drmaa
   (package
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 48/57] gnu: Add python-anyascii.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:41c0b25f68049677607d5246bece7ebffe2c4445.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-anyascii): New variable.

---

gnu/packages/python-xyz.scm | 17 +++++++++++++++++

1 file changed, 17 insertions(+)

Toggle diff (30 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b5574100de..d864d1a2f1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -279,6 +279,23 @@ (define-module (gnu packages python-xyz)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26))
 
+(define-public python-anyascii
+  (package
+    (name "python-anyascii")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "anyascii" version))
+       (sha256
+        (base32 "1xhibjqqn97pq90dsrqks265rr550napaz7d3v4qdqh6h9r5gpyy"))))
+    (build-system pyproject-build-system)
+    (home-page "https://github.com/anyascii/anyascii")
+    (synopsis "Unicode to ASCII transliteration")
+    (description "This package provides Unicode to ASCII transliteration for
+Python.")
+    (license license:expat)))
+
 (define-public python-xmldiff
   (package
     (name "python-xmldiff")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 50/57] gnu: Add python-django-permissionedforms.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:5acf2244471c51b65a4fa342f01b7ba7cbb07221.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-permissionedforms): New variable.

---

gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (47 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index c36f3f4ccb..7a8dd0a9b5 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -880,6 +880,40 @@ (define-public python-dj-database-url
 conn_max_age argument to easily enable Django’s connection pool.")
     (license license:bsd-2)))
 
+(define-public python-django-permissionedforms
+  (package
+    (name "python-django-permissionedforms")
+    (version "0.1")
+    ;; tests are not packaged in pypi
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wagtail/django-permissionedforms")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0dscl238yi4xyd4nz2cxr5kikyalqj5drmk935llal3rd0dcy30d"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "runtests.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-django))
+    (native-inputs (list python-django-modelcluster))
+    (home-page "https://github.com/wagtail/django-permissionedforms")
+    (synopsis
+     "Create forms that vary according to user permissions in Django")
+    (description
+     "This package provides a Django extension for creating forms that vary
+according to user permissions.")
+    (license license:bsd-3)))
+
 (define-public python-django-picklefield
   (package
     (name "python-django-picklefield")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 51/57] gnu: python-openpyxl: Update to 3.1.2.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:f0221fa8053a3b7a19cdd121ee482dd6c3778947.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-openpyxl): Update to 3.1.2.
[build-sytem] Use pyproject-build-system.
---
 gnu/packages/python-xyz.scm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d864d1a2f1..108c55ae68 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3491,7 +3491,7 @@ (define-public python-omero-py
 (define-public python-openpyxl
   (package
     (name "python-openpyxl")
-    (version "3.0.9")
+    (version "3.1.2")
     (source
      (origin
        ;; We use the upstream repository, as the tests are not included in the
@@ -3502,13 +3502,8 @@ (define-public python-openpyxl
              (changeset version)))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
-        (base32 "1p8xvc2gjw6zyzbd7qdvc3x178sm00ymrbyh9539l4fpzgxh0j9c"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (invoke "pytest"))))))
+        (base32 "0dvfv8vbbaqzchhjiyripy7blbj4sc4zhpbh60zabkx2aix83jjh"))))
+    (build-system pyproject-build-system)
     (native-inputs (list python-lxml python-pillow python-pytest))
     (propagated-inputs (list python-et-xmlfile python-jdcal))
     (home-page "https://openpyxl.readthedocs.io")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 47/57] gnu: Add python-l18n.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:46c59f3f372e96e2c93450175d750d8de6e8dc37.1693991781.git.ngraves@ngraves.fr

* gnu/packages/python-xyz.scm (python-l18n): New variable.

---

gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++

1 file changed, 20 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 71a0c581c9..b5574100de 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1891,6 +1891,26 @@ (define-public python-shortuuid
 module and then similar looking characters are removed.")
     (license license:bsd-3)))
 
+(define-public python-l18n
+  (package
+    (name "python-l18n")
+    (version "2021.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "l18n" version))
+       (sha256
+        (base32 "0j6q89d1mk03snvj4v1600fbrxjlq59k5490rhsp3lbkss8fhmhr"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-wheel))
+    (propagated-inputs (list python-pytz python-six))
+    (home-page "https://github.com/tkhyn/l18n")
+    (synopsis "Internationalization for timezones and territories")
+    (description
+     "This package provides internationalization for @code{python-pytz}
+timezones and territories.")
+    (license license:expat)))
+
 (define-public python-logwrap
   (package
     (name "python-logwrap")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 49/57] gnu: Add python-telepath.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:a947754ad8c69c803a859b155a1466e249d1c3b2.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-telepath): New variable.

---

gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++

1 file changed, 29 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 3f280ab233..c36f3f4ccb 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1636,3 +1636,32 @@ (define-public python-django-cleanup
 ImageField and their subclasses.  Files set as default values for any
 FileField are not deleted.")
     (license license:expat)))
+
+(define-public python-telepath
+  (package
+    (name "python-telepath")
+    (version "0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "telepath" version))
+       (sha256
+        (base32 "0k7q5dqgvcwnslb82ah0g6p772jzjmb6fd4wcdc8r46ibsjg4k7g"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-django python-pytest-django))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (setenv "DJANGO_SETTINGS_MODULE" "telepath.test_settings")
+                   (invoke "django-admin" "test" "--pythonpath=."))
+                 (format #t "test suite not run~%")))))))
+    (home-page "https://github.com/wagtail/telepath")
+    (synopsis "Exchanging data between Python and JavaScript")
+    (description
+     "This package provides @code{telepath}, a library for exchanging data
+between Python and JavaScript.")
+    (license license:bsd-3)))
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 52/57] gnu: Add python-wagtail.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:a4d064d2effd6ea97589c489165ca7b338fe922a.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-wagtail): New variable.

---

gnu/packages/django.scm | 70 +++++++++++++++++++++++++++++++++++++++++

1 file changed, 70 insertions(+)

Toggle diff (80 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 7a8dd0a9b5..8fea2a1723 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1699,3 +1699,73 @@ (define-public python-telepath
      "This package provides @code{telepath}, a library for exchanging data
 between Python and JavaScript.")
     (license license:bsd-3)))
+
+(define-public python-wagtail
+  (package
+    (name "python-wagtail")
+    (version "5.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "wagtail" version))
+       (sha256
+        (base32 "1fyjxb4g0mnmpr802jddylj6lc2fy4pf3zazsr2k9nx5hzgj3gfy"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:test-flags '("--pythonpath=."
+                      "--settings=wagtail.test.settings"
+                      ;; disabling failing azure tests
+                      "-k" "not test_azure_cdn_get_client"
+                      "-k" "not test_azure_cdn_purge"
+                      "-k" "not test_azure_front_door_get_client"
+                      "-k" "not test_azure_front_door_purge")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'hiding-failing-tests-imports
+           (lambda _
+             (substitute* "wagtail/contrib/frontend_cache/tests.py"
+               (("from azure" all)
+                (string-append "#" all)))))
+         (replace 'check
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
+             (if tests?
+                 (apply invoke "django-admin" "test" test-flags)))))))
+    (propagated-inputs
+     (list python-anyascii
+           python-beautifulsoup4
+           python-django-4.0
+           python-django-filter
+           python-django-modelcluster
+           python-django-taggit
+           python-django-permissionedforms
+           python-django-treebeard
+           python-django-rest-framework
+           python-draftjs-exporter
+           python-html5lib
+           python-l18n
+           python-openpyxl
+           python-pillow
+           python-requests
+           python-telepath
+           python-willow))
+    (native-inputs
+     ;; python-azure-mgmt-cdn ;failing tests
+     ;; python-azure-mgmt-frontdoor ;failing tests
+     (list python-boto3
+           python-dateutil
+           python-doc8
+           python-docutils
+           python-elasticsearch
+           python-freezegun
+           python-isort
+           python-jinja2
+           python-jinjalint
+           python-polib
+           python-pytz
+           python-unidecode
+           python-wagtail-factories))
+    (home-page "https://wagtail.org/")
+    (synopsis "A Content Management System (CMS)")
+    (description "This package provides a Content Management System based on
+Django.")
+    (license license:bsd-3)))
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 53/57] gnu: Add python-wagtail-factories.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:29254431bc342faf48c05a113856c0fd0ec9cf61.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-wagtail-factories): New variable.

---

gnu/packages/django.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Toggle diff (48 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 8fea2a1723..46be4f6f71 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1769,3 +1769,41 @@ (define-public python-wagtail
     (description "This package provides a Content Management System based on
 Django.")
     (license license:bsd-3)))
+
+(define-public python-wagtail-factories
+  (package
+    (name "python-wagtail-factories")
+    (version "4.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       ;; Fetch from the git repository, so that the tests can be run.
+       (uri (git-reference
+             (url "https://github.com/wagtail/wagtail-factories/")
+             (commit (string-append "v" version))))
+       (file-name (string-append name "-" version))
+       (sha256
+        (base32 "19ggc9nm31w7gq2k48ijhiq8dgkh63dsycvhrklxsrh8zwkwgln4"))))
+    (build-system pyproject-build-system)
+    (arguments
+     '(#:test-flags '("--settings=tests.settings" "--pythonpath=.")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? test-flags #:allow-other-keys)
+             (if tests?
+                 (apply invoke "django-admin" "test" test-flags)
+                 (format #t "test suite not run~%"))))
+         ;; Importing this module requires setting up a Django project.
+         (delete 'sanity-check))))
+    (propagated-inputs (list python-factory-boy))
+    (native-inputs (list python-pytest
+                         python-pytest-django
+                         (package/inherit python-wagtail
+                               (native-inputs '())
+                               (arguments '(#:tests? #f)))))
+    (home-page "https://github.com/wagtail/wagtail-factories/")
+    (synopsis "Factory boy classes for wagtail")
+    (description "This package provides factory boy classes for
+@code{wagtail}.  It is used for the migrating streamfields.")
+    (license license:expat)))
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 55/57] gnu: python-django: Update to 4.1.9.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:9513de43eb7ead233374e2b96ebdf977b7d47e2d.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django): Update to 4.1.9.

---

gnu/packages/django.scm | 15 +++++++--------

1 file changed, 7 insertions(+), 8 deletions(-)

Toggle diff (60 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 6bcdf700a6..fc9977914b 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -142,21 +142,21 @@ (define-public python-django-4.2
     (license license:bsd-3)
     (properties `((cpe-name . "django")))))
 
-(define-public python-django-4.0
+(define-public python-django-4.1
   (package
     (inherit python-django-4.2)
     (name "python-django")
-    (version "4.0.9")
+    (version "4.1.9")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "19vqbyc9icy8nbz9w44z83x6zf2j55gmgl9rxdgnqlwr5ykk9h3w"))))))
+                "0cphp9naxpim4jw9sws7185cb061qdaymz0vhw222rih96l79w79"))))))
 
 (define-public python-django-3.2
   (package
-    (inherit python-django-4.0)
+    (inherit python-django-4.1)
     (version "3.2.18")
     (source (origin
               (method url-fetch)
@@ -166,7 +166,7 @@ (define-public python-django-3.2
                 "1fikqpf75zjlx7dgdrrrz4212cajp6rl79rw0zzlzdifi7z8s808"))))
     (native-search-paths '())           ;no need for TZDIR
     (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-django-4.0)
+     (modify-inputs (package-propagated-inputs python-django-4.1)
        ;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
        (append python-pytz)))))
 
@@ -215,8 +215,7 @@ (define-public python-django-3.1.14
        (delete "python-asgiref")
        (append python-asgiref-3.4.1)))))
 
-;; Use 3.2 LTS as the default until packages gain support for 4.x.
-(define-public python-django python-django-4.0)
+(define-public python-django python-django-4.1)
 
 (define-public python-django-environ
   (package
@@ -1733,7 +1732,7 @@ (define-public python-wagtail
     (propagated-inputs
      (list python-anyascii
            python-beautifulsoup4
-           python-django-4.0
+           python-django
            python-django-filter
            python-django-modelcluster
            python-django-taggit
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 57/57] gnu: python-django-debug-toolbar: Update to 3.8.1.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:0825cb0afe3bbc8969e2a3094aaff85c839307ba.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-django-debug-toolbar): Update to 3.8.1.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-hatchling.
[arguments](phases): Ensure tests are only run when requested.
---
 gnu/packages/django.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index fc9977914b..330915124b 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -719,7 +719,7 @@ (define-public python-django-allauth
 (define-public python-django-debug-toolbar
   (package
     (name "python-django-debug-toolbar")
-    (version "3.2.1")
+    (version "3.8.1")
     (source
      (origin
        (method git-fetch)
@@ -728,19 +728,23 @@ (define-public python-django-debug-toolbar
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1m1j2sx7q0blma0miswj3c8hrfi5q4y5cq2b816v8gagy89xgc57"))))
-    (build-system python-build-system)
+        (base32 "1h8m5my90h3p93lqi9dm60ih0lac7awn1svdqaqci6qykkdk0l8s"))))
+    (build-system pyproject-build-system)
     (propagated-inputs
      (list python-sqlparse python-django))
     (native-inputs
-     (list python-django-jinja python-html5lib tzdata-for-tests))
+     (list python-django-jinja
+           python-html5lib
+           tzdata-for-tests
+           python-hatchling))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
-             (invoke "make" "test"))))))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (if tests?
+                 (invoke "make" "test")
+                 (format #t "test suite not run~%")))))))
     (home-page
      "https://github.com/jazzband/django-debug-toolbar")
     (synopsis "Toolbar to help with developing Django applications")
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 56/57] gnu: patchwork: Update to 3.1.3.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:3023b3d2d9e89caa678a727217051b223337684d.1693991781.git.ngraves@ngraves.fr

* gnu/packages/patchutils.scm (patchwork): Update to 3.1.3.
[inputs]: Replace python-django-3.2 by python-django.
---
 gnu/packages/patchutils.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (33 lines)diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index efb9a04aee..429dd88b8e 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -370,7 +370,7 @@ (define-public meld
 (define-public patchwork
   (package
     (name "patchwork")
-    (version "3.1.1")
+    (version "3.1.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -379,7 +379,7 @@ (define-public patchwork
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0is9d4gf93jcbyshyj2k3kjyrjnvimrm6bai6dbcx630md222j5w"))))
+                "12m17hiax8zvpxl3jdkwv8zvjf1ldiqjjqiqvgc5d3kqnnmfjzn3"))))
     (build-system python-build-system)
     (arguments
      `(;; TODO: Tests require a running database
@@ -503,7 +503,7 @@ (define-public patchwork
     (inputs
      (list python-wrapper))
     (propagated-inputs
-     (list python-django-3.2
+     (list python-django
            ;; TODO: Make this configurable
            python-psycopg2
            python-mysqlclient
-- 
2.41.0

Nicolas Graves wrote on 6 Sep 2023 11:16

[PATCH v7 54/57] gnu: Add python-wagtail-localize.

Recipients:(address . 65758@debbugs.gnu.org)(address . ngraves@ngraves.fr)

Message-ID:c794d52da00da7f0beaa11e28f23dd1a32a962aa.1693991781.git.ngraves@ngraves.fr

* gnu/packages/django.scm (python-wagtail-localize): New variable.

---

gnu/packages/django.scm | 40 ++++++++++++++++++++++++++++++++++++++++

1 file changed, 40 insertions(+)

Toggle diff (50 lines)diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 46be4f6f71..6bcdf700a6 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1807,3 +1807,43 @@ (define-public python-wagtail-factories
     (description "This package provides factory boy classes for
 @code{wagtail}.  It is used for the migrating streamfields.")
     (license license:expat)))
+
+(define-public python-wagtail-localize
+  (package
+    (name "python-wagtail-localize")
+    (version "1.5.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/wagtail/wagtail-localize")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "143rwwz94wlqwbckg8ccfxkn5ydb1mzr9dqn4zldpsrbgg3p4cj6"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; TODO Remove this when moving to recent versions of flit-core.
+         (add-after 'unpack 'fix-flit-core-glob
+           (lambda _
+             (substitute* "pyproject.toml"
+               (("wagtail_localize\\/\\*\\*\\/tests")
+                (string-join
+                 (find-files "." "tests$" #:directories? #t)
+                 "\",\n    \"")))))
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "testmanage.py")
+                 (format #t "test suite not run~%")))))))
+    (propagated-inputs (list python-django python-polib python-wagtail))
+    (native-inputs (list python-dj-database-url
+                         python-flit-core
+                         python-freezegun
+                         python-typing-extensions))
+    (home-page "https://www.wagtail-localize.org")
+    (synopsis "Translating for Wagtail Content Management System (CMS)")
+    (description "This package provides a translation plugin for Wagtail CMS.")
+    (license license:bsd-3)))
-- 
2.41.0

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 65758@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date