[bug#55474] [PATCH 01/18] gnu: python-django-taggit: Update to 2.1.0.

[bug#55474] [PATCH 01/18] gnu: python-django-taggit: Update to 2.1.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-taggit): Update to 2.1.0.
---
 gnu/packages/django.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index d62f4376b6..2abdb784c8 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -308,14 +308,13 @@ (define-public python-django-classy-tags
 (define-public python-django-taggit
   (package
     (name "python-django-taggit")
-    (version "1.3.0")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-taggit" version))
        (sha256
-        (base32
-         "0bbkabbs77z229ps0800gxfhf75yagp4x4j5jzfysbac3zvkp0sa"))))
+        (base32 "0khqd189xlzs9r5ypjchmvp9isw7xql4f9vgv0l4pzlfsm51xx59"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -324,9 +323,9 @@ (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))
     (home-page
      "https://github.com/jazzband/django-taggit")
     (synopsis
-- 
2.36.0

[bug#55473] [PATCH 02/18] gnu: python-django-filter: Update to 21.1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-filter): Update to 21.1.
---
 gnu/packages/django.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 2abdb784c8..ea8ed040f8 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -452,13 +452,13 @@ (define-public python-django-haystack
 (define-public python-django-filter
   (package
     (name "python-django-filter")
-    (version "2.3.0")
+    (version "21.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-filter" version))
               (sha256
                (base32
-                "1bz5qzdk9pk4a2lp2yacrdnqmkv24vxnz4k3lykrnpc3b7bkvrhi"))))
+                "0vl3sriw9ra0mhz7zzkxvlkgiqignlmr7zyfii5xpapim0gjaak3"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
-- 
2.36.0

[bug#55476] [PATCH 03/18] gnu: Add python-django-modelcluster.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-modelcluster): New variable.
---
 gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index ea8ed040f8..fee4278708 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -780,6 +780,35 @@ (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 "5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "https://github.com/wagtail/django-modelcluster/archive/refs/tags/v5.3.tar.gz")
+       (sha256
+        (base32 "0xlhlnsr8gingbrsgbzhx79z9ds9i9rfii3gp38xnid01xjwlqln"))))
+    (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~%")))))))
+    (propagated-inputs (list python-django python-pytz))
+    (native-inputs (list python-django-taggit))
+    (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.36.0

[bug#55474] [PATCH 04/18] gnu: Add python-django-treebeard.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-treebeard): New variable.
---
 gnu/packages/django.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index fee4278708..0755b5d9fe 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -334,6 +334,39 @@ (define-public python-django-taggit
      "Django-taggit is a reusable Django application for simple tagging.")
     (license license:bsd-3)))
 
+(define-public python-django-treebeard
+  (package
+    (name "python-django-treebeard")
+    (version "4.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-treebeard" version))
+       (sha256
+        (base32 "1nk9b40cp0jsxr3qsb16mh9xr0z3cvf69yp5ahh70fajf8bh05c0"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (setenv "PYTHONPATH"
+                           (string-append ".:" (getenv "GUIX_PYTHONPATH")))
+                   (setenv "DJANGO_SETTINGS_MODULE" "treebeard.tests.settings")
+                   (substitute* "setup.py" ((".*pythonpath.*") ""))
+                   (invoke "pytest" "-vv"))
+                 (format #t "test suite not run~%")))))))
+    (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 an efficient tree implementations for Django.")
+    (license license:bsd-3)))
+
 (define-public python-easy-thumbnails
   (package
     (name "python-easy-thumbnails")
-- 
2.36.0

[bug#55475] [PATCH 05/18] gnu: Add python-jinjalint.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jinjalint): New variable.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 29b42ea3a0..5d6a60c771 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4272,6 +4272,37 @@ (define-public python-jinja2-time
 templates.  A format string can be provided to control the output.")
     (license license:expat)))
 
+(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 python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'lift-requirements
+           (lambda _
+             (substitute* "requirements.txt"
+               (("parsy==1.1.0.*") "parsy\n")
+               (("attrs==17.2.*") "attrs\n")
+               (("docopt==0.6.2.*") "docopt\n"))))
+         (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 "A linter for Jinja-like templates")
+    (description "This package provides a linter for Jinja-like templates.")
+    (license license:expat)))
+
 (define-public python-pystache
   (package
     (name "python-pystache")
-- 
2.36.0

[bug#55474] [PATCH 06/18] gnu: Add python-flake8-blind-except.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-flake8-blind-except): New variable.
---
 gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5d6a60c771..7f67a93f4b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11088,6 +11088,25 @@ (define-public python-flake8-3.8
      (list python-pycodestyle-2.6 python-entrypoints python-pyflakes-2.2
            python-mccabe))))
 
+(define-public python-flake8-blind-except
+  (package
+    (name "python-flake8-blind-except")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "flake8-blind-except" version))
+       (sha256
+        (base32 "05nxsxfzfhwsm8gys90228imm2qbnqnw5y8bfqyfngnbkmd5fnpj"))))
+    (build-system python-build-system)
+    (native-inputs (list python-pycodestyle python-pep8))
+    (home-page "https://github.com/elijahandrews/flake8-blind-except")
+    (synopsis "A flake8 extension that checks for blind except: statements")
+    (description
+     "This package provides a flake8 extension that checks for blind except:
+statements.")
+    (license license:expat)))
+
 (define-public python-flake8-bugbear
   (package
     (name "python-flake8-bugbear")
-- 
2.36.0

[bug#55474] [PATCH 07/18] gnu: Add python-willow.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-willow): New variable.
---
 gnu/packages/python-xyz.scm | 53 +++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7f67a93f4b..308ea79075 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7550,25 +7550,50 @@ (define-public python-pillow-simd
     (description "This package is a fork of Pillow which adds support for SIMD
 parallelism.")))
 
-(define-public python-imagecodecs
+(define-public python-willow
   (package
-    (name "python-imagecodecs")
-    (version "2021.3.31")
+    (name "python-willow")
+    (version "1.4.1")
     (source
       (origin
         (method url-fetch)
-        (uri (pypi-uri "imagecodecs" version))
+        (uri (pypi-uri "Willow" version))
         (sha256
-          (base32
-            "0q7pslb6wd56vbcq2mdxwsiha32mxjr7mgqqfbq5w42q601p9pi0"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin
-            ;; Unbundle 3rd party modules.
-            (delete-file-recursively "3rdparty")
-            ;; Delete pre-generated Cython files.
-            (for-each delete-file (find-files "imagecodecs" "_.*\\.c$"))
-            #t))))
+          (base32 "03ccxy5j3w5gsjz5nbnlya1drhga3gc2xxqbsi40pq1ihm9gzy0d"))))
+    (build-system python-build-system)
+    (inputs
+     (list freetype lcms libjpeg-turbo libtiff libwebp openjpeg zlib))
+    (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")
+    (version "2021.3.31")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "imagecodecs" version))
+       (sha256
+         (base32
+          "0q7pslb6wd56vbcq2mdxwsiha32mxjr7mgqqfbq5w42q601p9pi0"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Unbundle 3rd party modules.
+           (delete-file-recursively "3rdparty")
+           ;; Delete pre-generated Cython files.
+           (for-each delete-file (find-files "imagecodecs" "_.*\\.c$"))
+           #t))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ; Tests are disabled, because dependencies are missing.
-- 
2.36.0

[bug#55474] [PATCH 08/18] gnu: Add python-django-request.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-request): New variable.
---
 gnu/packages/django.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 0755b5d9fe..92a9e580e9 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -240,6 +240,38 @@ (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.5.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-request" version))
+       (sha256
+        (base32 "0g5vj7kl5jn03m8h9jd0fpmhhvaywrhw01fcphcah4vf0y40ly00"))))
+    (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~%")))))))
+    (propagated-inputs
+     (list python-dateutil python-django python-six))
+    (native-inputs
+     (list python-sqlparse python-mock))
+    (home-page "https://django-request.readthedocs.io")
+    (synopsis
+     "statistics module for django")
+    (description
+     "django-request is 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-simple-math-captcha
   (package
     (name "python-django-simple-math-captcha")
-- 
2.36.0

[bug#55474] [PATCH 09/18] gnu: Add python-django-environ.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-environ): New variable.
---
 gnu/packages/django.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 92a9e580e9..63aa0a2db7 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -171,6 +171,25 @@ (define-public python-django-2.2
 ;; 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-environ
+  (package
+    (name "python-django-environ")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-environ" version))
+       (sha256
+        (base32 "1jrllmr9awbhj68l8jkqj8lcc7c6l35khsa841mnb49qnh1cj2vg"))))
+    (build-system python-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 "A package that allows you to utilize 12factor inspired
+environment variables to configure your Django application.")
+    (license license:expat)))
+
 (define-public python-django-extensions
   (package
     (name "python-django-extensions")
-- 
2.36.0

[bug#55474] [PATCH 10/18] gnu: Add python-psycopg2-2.8.

[Nicolas Graves via Guix-patches via]

* gnu/packages/databases.scm (python-psycopg2-2.8): New variable.
---
 gnu/packages/databases.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index feedfe68e7..39ec5929eb 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3718,6 +3718,18 @@ (define-public python-psycopg2
 2.0.")
     (license license:lgpl3+)))
 
+(define-public python-psycopg2-2.8
+  (package
+    (inherit python-psycopg2)
+    (name "python-psycopg2-2.8")
+    (version "2.8.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "psycopg2" version))
+       (sha256
+        (base32 "0hzmk6b1hb5riqkljr5xics6p4zbvmis6knbczb7zhq7273zc8zv"))))))
+
 (define-public python-psycopg-pool
   (package
     (name "python-psycopg-pool")
-- 
2.36.0

[bug#55474] [PATCH 11/18] gnu: Add python-beautifulsoup4-4.8.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-beautifulsoup4-4.8): New variable.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 308ea79075..7ae0b00ffb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9942,6 +9942,37 @@ (define-public python2-beautifulsoup4
            "09gbd49mwz86k572r1231x2rdp82p42zlnw0bz9b9mfi58r9wwl4"))))
       (arguments `(#:python ,python-2)))))
 
+(define-public python-beautifulsoup4-4.8
+  (package
+    (inherit python-beautifulsoup4)
+    (name "python-beautifulsoup4")
+    (version "4.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "https://www.crummy.com/software/BeautifulSoup/bs4/download/4.8/beautifulsoup4-4.8.2.tar.gz")
+       (sha256
+        (base32 "0aj6ll0zpmm32g3919xxclwincacdr6dymkscmvhha8wn1g85z85"))))
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; The Python 2 source is the definitive source of beautifulsoup4. We
+         ;; must use this conversion script when building with Python 3. The
+         ;; conversion script also runs the tests.
+         ;; For more information, see the file 'convert-py3k' in the source
+         ;; distribution.
+         (add-before 'build 'convert-py3k
+           (lambda _
+             (substitute* "convert-py3k"
+               (("\\(cd py3k && python3 -m unittest discover -s bs4\\)") ""))
+             (invoke "./convert-py3k")
+             (delete-file-recursively "bs4")
+             (mkdir-p "bs4")
+             (copy-recursively "py3k/bs4" "bs4")
+             (substitute* "setup.py"
+               (("use_2to3 = True,") "")))))))))
+
 (define-public python-soupsieve
   (package
     (name "python-soupsieve")
-- 
2.36.0

[bug#55474] [PATCH 12/18] gnu: Add python-draftjs-exporter.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-draftjs-exporter): New variable.
---
 gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7ae0b00ffb..40a591ca7d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8159,6 +8159,39 @@ (define-public python2-decorator
        (sha256
         (base32 "0308djallnh00v112y5b7nadl657ysmkp6vc8xn51d6yzc9zm7n3"))))))
 
+(define-public python-draftjs-exporter
+  (package
+    (name "python-draftjs-exporter")
+    (version "2.1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "https://github.com/springload/draftjs_exporter/archive/refs/tags/v2.1.7.tar.gz")
+       (sha256
+        (base32 "02fjmzagvnc146zqhc0xg6mybrkjg3pc7wbl4pmbq4gvmwjsml4c"))))
+    (build-system python-build-system)
+    (native-inputs (list python-beautifulsoup4-4.8
+                         python-html5lib
+                         python-lxml))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "-m" "unittest" "discover"
+                     ;; disabling two unexpected failing tests FIXME
+                     "-k" "not test_export_lxml_big_content_export"
+                     "-k" "not test_export_lxml_entity_with_data-*")
+                 (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 library to convert rich text from Draft.js raw
+ContentState to HTML.")
+    (license license:expat)))
+
 (define-public python-drmaa
   (package
     (name "python-drmaa")
-- 
2.36.0

[bug#55474] [PATCH 13/18] gnu: Add python-l18n.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-l18n): New variable.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 40a591ca7d..3eaca7bba1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1197,6 +1197,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 python-build-system)
+    (native-inputs (list python-wheel))
+    (propagated-inputs (list python-pytz python-six))
+    (home-page "https://github.com/tkhyn/l18n")
+    (synopsis "Internationalization for pytz timezones and territories")
+    (description
+     "This package provides internationalization for Python pytz
+timezones and territories.")
+    (license license:expat)))
+
 (define-public python-logwrap
   (package
     (name "python-logwrap")
-- 
2.36.0

[bug#55474] [PATCH 14/18] gnu: Add python-parsy.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-parsy): New variable.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3eaca7bba1..ba59d142a9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3141,6 +3141,24 @@ (define-public python-parse
 syntax.")
     (license license:x11)))
 
+(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 python-build-system)
+    (native-inputs (list python-pytest python-attrs))
+    (home-page "https://github.com/python-parsy/parsy")
+    (synopsis "easy-to-use parser combinators, for 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.36.0

[bug#55474] [PATCH 15/18] gnu: Add python-anyascii.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-anyascii): New variable.
---
 gnu/packages/python-xyz.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ba59d142a9..6be4310371 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -251,6 +251,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 python-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.36.0

[bug#55474] [PATCH 16/18] gnu: Add python-telepath.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-telepath): New variable.
---
 gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 63aa0a2db7..46891fd044 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1456,3 +1456,32 @@ (define-public python-django-svg-image-form-field
 models that use Django's standard @code{ImageField}, in addition to the
 image files already supported by it.")
     (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 python-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 "A library for exchanging data between Python and JavaScript")
+    (description
+      "This package provides a library for exchanging data between Python and
+JavaScript.")
+    (license license:bsd-3)))
-- 
2.36.0

[bug#55474] [PATCH 17/18] gnu: Add python-wagtail.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail): New variable.
---
 gnu/packages/django.scm | 69 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 46891fd044..63626940cd 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1485,3 +1485,72 @@ (define-public python-telepath
       "This package provides a library for exchanging data between Python and
 JavaScript.")
     (license license:bsd-3)))
+
+(define-public python-wagtail
+  (package
+    (name "python-wagtail")
+    (version "2.16.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "wagtail" version))
+       (sha256
+        (base32 "1alxxj7aiwj1ymaharzxv7sq7kyv555jg5fc1b98aiwxlcdxq8zf"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (setenv "DJANGO_SETTINGS_MODULE" "wagtail.tests.settings")
+                   (invoke "django-admin"
+                           "test" "--pythonpath=."
+                           ;; disabling failing 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"))))))))
+    (propagated-inputs
+     (list python-anyascii
+           python-beautifulsoup4-4.8
+           python-django
+           python-django-filter
+           python-django-modelcluster
+           python-django-taggit
+           python-django-treebeard
+           python-django-rest-framework
+           python-draftjs-exporter
+           python-html5lib
+           python-l18n
+           python-pillow
+           python-requests
+           python-tablib
+           python-telepath
+           python-willow
+           python-xlsxwriter))
+    (native-inputs
+     (list ;; python-azure-mgmt-cdn ;failing tests
+           ;; python-azure-mgmt-frontdoor ;failing tests
+           python-boto3
+           python-coverage
+           python-dateutil
+           python-doc8
+           python-docutils
+           python-elasticsearch
+           python-flake8
+           python-flake8-blind-except
+           python-flake8-print
+           python-freezegun
+           python-isort
+           python-jinja2
+           python-jinjalint
+           python-openpyxl
+           python-polib
+           python-pytz
+           python-unidecode))
+    (home-page "https://wagtail.org/")
+    (synopsis "A Django content management system.")
+    (description "This package provides a Django content management system.")
+    (license license:bsd-3)))
-- 
2.36.0

[bug#55474] [PATCH 18/18] gnu: Add python-wagtail-localize.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail-localize): New variable.
---
 gnu/packages/django.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 63626940cd..abfce310c2 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1554,3 +1554,33 @@ (define-public python-wagtail
     (synopsis "A Django content management system.")
     (description "This package provides a Django content management system.")
     (license license:bsd-3)))
+
+(define-public python-wagtail-localize
+  (package
+    (name "python-wagtail-localize")
+    (version "1.1.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
+        "014vcjzm1akbjinzqksqi228ic97f4brl0qvhxlyr42p49nxgh0y"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (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-freezegun))
+    (home-page "https://www.wagtail-localize.org")
+    (synopsis "Translation plugin for Wagtail CMS")
+    (description "This package provides a translation plugin for Wagtail CMS.")
+    (license license:bsd-3)))
-- 
2.36.0

[bug#55474] Acknowledgement ([PATCH 01/18] gnu: python-django-taggit: Update to 2.1.0.)

[Nicolas Graves via Guix-patches via]

Quick reminder ;)

This series of patches implement the wagtail python package, and is
functional and tested.

Cheers,

Nicolas Graves

help-debbugs@gnu.org (GNU bug Tracking System) writes:

> Thank you for filing a new bug report with debbugs.gnu.org.
>
> This is an automatically generated reply to let you know your message
> has been received.
>
> Your message is being forwarded to the package maintainers and other
> interested parties for their attention; they will reply in due course.
>
> Your message has been sent to the package maintainer(s):
>  guix-patches@gnu.org
>
> If you wish to submit further information on this problem, please
> send it to 55474@debbugs.gnu.org.
>
> Please do not send mail to help-debbugs@gnu.org unless you wish
> to report a problem with the Bug-tracking system.
>
> -- 
> 55474: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55474
> GNU Bug Tracking System
> Contact help-debbugs@gnu.org with problems

[bug#55474] Acknowledgement ([PATCH 01/18] gnu: python-django-taggit: Update to 2.1.0.)

[Nicolas Graves via Guix-patches via]

On 2022-06-12 20:25, Nicolas Graves via Guix-patches via wrote:

> Quick reminder ;)
>
> This series of patches implement the wagtail python package, and is
> functional and tested.

Maybe if it's a lot of updates at once, and the Guix QA tool is unable
to evaluate them, you can set a new python branch to test these? I have
them ontop of my local Guix, but since it starts to trigger a few (the
total number of concerned packages is still under what would be needed
for another branch I think) but very long rebuilds, I would really like
to get them merged.

Thanks in advance,

-- 
Best regards,
Nicolas Graves

[bug#55474] [PATCH v2 01/17] gnu: python-django-taggit: Update to 2.1.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-taggit): Update to 2.1.0.
---
 gnu/packages/django.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 0eb9ccf0f3..ec6012f19c 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -325,14 +325,13 @@ (define-public python-django-classy-tags
 (define-public python-django-taggit
   (package
     (name "python-django-taggit")
-    (version "1.3.0")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-taggit" version))
        (sha256
-        (base32
-         "0bbkabbs77z229ps0800gxfhf75yagp4x4j5jzfysbac3zvkp0sa"))))
+        (base32 "0khqd189xlzs9r5ypjchmvp9isw7xql4f9vgv0l4pzlfsm51xx59"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -341,15 +340,16 @@ (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))
     (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.37.1

[bug#55474] [PATCH v2 02/17] gnu: python-django-filter: Update to 21.1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-filter): Update to 21.1.
---
 gnu/packages/django.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index ec6012f19c..d00f7a073d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -470,13 +470,13 @@ (define-public python-django-haystack
 (define-public python-django-filter
   (package
     (name "python-django-filter")
-    (version "2.3.0")
+    (version "21.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-filter" version))
               (sha256
                (base32
-                "1bz5qzdk9pk4a2lp2yacrdnqmkv24vxnz4k3lykrnpc3b7bkvrhi"))))
+                "0vl3sriw9ra0mhz7zzkxvlkgiqignlmr7zyfii5xpapim0gjaak3"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -488,12 +488,12 @@ (define-public python-django-filter
      (list python-django python-django-rest-framework
            python-django-crispy-forms python-mock))
     (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.37.1

[bug#55474] [PATCH v2 03/17] gnu: Add python-django-modelcluster.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-modelcluster): New variable.
---
 gnu/packages/django.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index d00f7a073d..dfd799faba 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -798,6 +798,38 @@ (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 "5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://github.com/wagtail/django-modelcluster"
+         "/archive/refs/tags/v" version ".tar.gz"))
+       (sha256
+        (base32 "0xlhlnsr8gingbrsgbzhx79z9ds9i9rfii3gp38xnid01xjwlqln"))))
+    (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~%")))))))
+    (propagated-inputs (list python-django python-pytz))
+    (native-inputs (list python-django-taggit))
+    (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.37.1

[bug#55474] [PATCH v2 04/17] gnu: Add python-django-treebeard.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-treebeard): New variable.
---
 gnu/packages/django.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index dfd799faba..617c897ba8 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -352,6 +352,47 @@ (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.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-treebeard" version))
+       (sha256
+        (base32 "1nk9b40cp0jsxr3qsb16mh9xr0z3cvf69yp5ahh70fajf8bh05c0"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (setenv "PYTHONPATH"
+                           (string-append ".:" (getenv "GUIX_PYTHONPATH")))
+                   (setenv "DJANGO_SETTINGS_MODULE" "treebeard.tests.settings")
+                   (substitute* "setup.py" ((".*pythonpath.*") ""))
+                   (invoke "pytest" "-vv"))
+                 (format #t "test suite not run~%")))))))
+    (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.37.1

[bug#55474] [PATCH v2 05/17] gnu: Add python-jinjalint.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jinjalint): New variable.
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b6ca32a757..a94e632028 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4107,6 +4107,38 @@ (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 python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'lift-requirements
+           (lambda _
+             (substitute* "requirements.txt"
+               (("parsy==1.1.0.*") "parsy\n")
+               (("attrs==17.2.*") "attrs\n")
+               (("docopt==0.6.2.*") "docopt\n"))))
+         (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.37.1

[bug#55474] [PATCH v2 06/17] gnu: Add python-willow.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-willow): New variable.
---
 gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a94e632028..c3b1da69ac 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7145,6 +7145,31 @@ (define-public python-pillow-simd
     (description "This package is a fork of Pillow which adds support for SIMD
 parallelism.")))
 
+(define-public python-willow
+  (package
+    (name "python-willow")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Willow" version))
+       (sha256
+        (base32 "03ccxy5j3w5gsjz5nbnlya1drhga3gc2xxqbsi40pq1ihm9gzy0d"))))
+    (build-system python-build-system)
+    (inputs
+     (list freetype lcms libjpeg-turbo libtiff libwebp openjpeg zlib))
+    (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.37.1

[bug#55474] [PATCH v2 07/17] gnu: Add python-django-request.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-request): New variable.
---
 gnu/packages/django.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 617c897ba8..600ea055b8 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -257,6 +257,38 @@ (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.5.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-request" version))
+       (sha256
+        (base32 "0g5vj7kl5jn03m8h9jd0fpmhhvaywrhw01fcphcah4vf0y40ly00"))))
+    (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~%")))))))
+    (propagated-inputs
+     (list python-dateutil python-django python-six))
+    (native-inputs
+     (list python-sqlparse python-mock))
+    (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-simple-math-captcha
   (package
     (name "python-django-simple-math-captcha")
-- 
2.37.1

[bug#55474] [PATCH v2 08/17] gnu: Add python-django-environ.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-environ): New variable.
---
 gnu/packages/django.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 600ea055b8..9fe6de74fa 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -188,6 +188,25 @@ (define-public python-django-2.2
 ;; 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-environ
+  (package
+    (name "python-django-environ")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-environ" version))
+       (sha256
+        (base32 "1jrllmr9awbhj68l8jkqj8lcc7c6l35khsa841mnb49qnh1cj2vg"))))
+    (build-system python-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.37.1

[bug#55474] [PATCH v2 09/17] gnu: Add python-psycopg2-2.8.

[Nicolas Graves via Guix-patches via]

* gnu/packages/databases.scm (python-psycopg2-2.8): New variable.
---
 gnu/packages/databases.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9535b65dbd..aa4e3e7437 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3657,6 +3657,18 @@ (define-public python-psycopg2
 2.0.")
     (license license:lgpl3+)))
 
+(define-public python-psycopg2-2.8
+  (package
+    (inherit python-psycopg2)
+    (name "python-psycopg2-2.8")
+    (version "2.8.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "psycopg2" version))
+       (sha256
+        (base32 "0hzmk6b1hb5riqkljr5xics6p4zbvmis6knbczb7zhq7273zc8zv"))))))
+
 (define-public python-psycopg-pool
   (package
     (name "python-psycopg-pool")
-- 
2.37.1

[bug#55474] [PATCH v2 10/17] gnu: Add python-beautifulsoup4-4.8.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-beautifulsoup4-4.8): New variable.
---
 gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3b1da69ac..bb8552f248 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9390,6 +9390,39 @@ (define-public python-beautifulsoup4
 converts incoming documents to Unicode and outgoing documents to UTF-8.")
     (license license:expat)))
 
+(define-public python-beautifulsoup4-4.8
+  (package
+    (inherit python-beautifulsoup4)
+    (name "python-beautifulsoup4")
+    (version "4.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://www.crummy.com/software/BeautifulSoup/bs4/download/"
+             "4.8/beautifulsoup4-" version ".tar.gz"))
+       (sha256
+        (base32 "0aj6ll0zpmm32g3919xxclwincacdr6dymkscmvhha8wn1g85z85"))))
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         ;; The Python 2 source is the definitive source of beautifulsoup4. We
+         ;; must use this conversion script when building with Python 3. The
+         ;; conversion script also runs the tests.
+         ;; For more information, see the file 'convert-py3k' in the source
+         ;; distribution.
+         (add-before 'build 'convert-py3k
+           (lambda _
+             (substitute* "convert-py3k"
+               (("\\(cd py3k && python3 -m unittest discover -s bs4\\)") ""))
+             (invoke "./convert-py3k")
+             (delete-file-recursively "bs4")
+             (mkdir-p "bs4")
+             (copy-recursively "py3k/bs4" "bs4")
+             (substitute* "setup.py"
+               (("use_2to3 = True,") "")))))))))
+
 (define-public python-soupsieve
   (package
     (name "python-soupsieve")
-- 
2.37.1

[bug#55474] [PATCH v2 11/17] gnu: Add python-draftjs-exporter.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-draftjs-exporter): New variable.
---
 gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bb8552f248..f7c77acbbf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7791,6 +7791,41 @@ (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 python-build-system)
+    (native-inputs (list python-beautifulsoup4-4.8
+                         python-html5lib
+                         python-lxml))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "-m" "unittest" "discover"
+                     ;; disabling two unexpected failing tests FIXME
+                     "-k" "not test_export_lxml_big_content_export"
+                     "-k" "not test_export_lxml_entity_with_data-*")
+                 (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.37.1

[bug#55474] [PATCH v2 12/17] gnu: Add python-l18n.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-l18n): New variable.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f7c77acbbf..a2b64fe3ed 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1247,6 +1247,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 python-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.37.1

[bug#55474] [PATCH v2 13/17] gnu: Add python-parsy.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-parsy): New variable.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a2b64fe3ed..3ca123148c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2963,6 +2963,24 @@ (define-public python-parse
 syntax.")
     (license license:x11)))
 
+(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 python-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.37.1

[bug#55474] [PATCH v2 14/17] gnu: Add python-anyascii.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-anyascii): New variable.
---
 gnu/packages/python-xyz.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3ca123148c..90b3c6686f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -260,6 +260,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 python-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.37.1

[bug#55474] [PATCH v2 15/17] gnu: Add python-telepath.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-telepath): New variable.
---
 gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 9fe6de74fa..8400d96898 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1485,3 +1485,32 @@ (define-public python-django-svg-image-form-field
 models that use Django's standard @code{ImageField}, in addition to the
 image files already supported by it.")
     (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 python-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.37.1

[bug#55474] [PATCH v2 16/17] gnu: Add python-wagtail.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail): New variable.
---
 gnu/packages/django.scm | 70 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 8400d96898..934aa8e95a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1514,3 +1514,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 "2.16.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "wagtail" version))
+       (sha256
+        (base32 "1alxxj7aiwj1ymaharzxv7sq7kyv555jg5fc1b98aiwxlcdxq8zf"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (setenv "DJANGO_SETTINGS_MODULE" "wagtail.tests.settings")
+                   (invoke "django-admin"
+                           "test" "--pythonpath=."
+                           ;; disabling failing 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"))))))))
+    (propagated-inputs
+     (list python-anyascii
+           python-beautifulsoup4-4.8
+           python-django
+           python-django-filter
+           python-django-modelcluster
+           python-django-taggit
+           python-django-treebeard
+           python-django-rest-framework
+           python-draftjs-exporter
+           python-html5lib
+           python-l18n
+           python-pillow
+           python-requests
+           python-tablib
+           python-telepath
+           python-willow
+           python-xlsxwriter))
+    (native-inputs
+     (list ;; python-azure-mgmt-cdn ;failing tests
+      ;; python-azure-mgmt-frontdoor ;failing tests
+      python-boto3
+      python-coverage
+      python-dateutil
+      python-doc8
+      python-docutils
+      python-elasticsearch
+      python-flake8
+      python-flake8-blind-except
+      python-flake8-print
+      python-freezegun
+      python-isort
+      python-jinja2
+      python-jinjalint
+      python-openpyxl
+      python-polib
+      python-pytz
+      python-unidecode))
+    (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.37.1

[bug#55474] [PATCH v2 17/17] gnu: Add python-wagtail-localize.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail-localize): New variable.
---
 gnu/packages/django.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 934aa8e95a..cd88e1fac3 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1584,3 +1584,33 @@ (define-public python-wagtail
     (description "This package provides a Content Management System based on
 Django.")
     (license license:bsd-3)))
+
+(define-public python-wagtail-localize
+  (package
+    (name "python-wagtail-localize")
+    (version "1.1.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
+         "014vcjzm1akbjinzqksqi228ic97f4brl0qvhxlyr42p49nxgh0y"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (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-freezegun))
+    (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.37.1

[bug#55474] [PATCH v2 17/17] gnu: Add python-wagtail-localize.

[Nicolas Graves via Guix-patches via]

Hi!
Quick reminder for this patch series waiting for 4 months ;)

-- 
Best regards,
Nicolas Graves

[bug#55474] [PATCH v2 17/17] gnu: Add python-wagtail-localize.

[Lars-Dominik Braun]

Hi Nicolas,

> Quick reminder for this patch series waiting for 4 months ;)

does it still make sense to add wagtail 2.16? There’s release 4.1.1
available. Maybe we can also drop the extra versions of beautifulsoup4
and psycopg2, since both got updated in the meantime.

Cheers,
Lars

[bug#55474] [PATCH v2 17/17] gnu: Add python-wagtail-localize.

[Lars-Dominik Braun]

Hi Nicolas,

> I'll come up with a new patch series in the coming weeks merging this
> one, 57094, and updating up to the latest version. (I didn't have the
> knowledge or confidence to do it this way 8 months ago).
alright. Please send it as v3 to #55474. Also note that we have
pyproject-build-system now, which makes your life easier for
pyproject.toml-based packages (i.e. no custom phases required).

Thanks,
Lars

[bug#55474] [PATCH v2 17/17] gnu: Add python-wagtail-localize.

[Nicolas Graves via Guix-patches via]

On 2023-01-05 08:53, Lars-Dominik Braun wrote:

> Hi Nicolas,
>
>> I'll come up with a new patch series in the coming weeks merging this
>> one, 57094, and updating up to the latest version. (I didn't have the
>> knowledge or confidence to do it this way 8 months ago).
> alright. Please send it as v3 to #55474. Also note that we have
> pyproject-build-system now, which makes your life easier for
> pyproject.toml-based packages (i.e. no custom phases required).

Hey Lars,

I've sent an updated patch series. The v4 uses pyproject-build-system. 

>
> Thanks,
> Lars
>

-- 
Best regards,
Nicolas Graves

[bug#55474] [PATCH v3 01/17] gnu: python-django-taggit: Update to 3.1.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-taggit): Update to 3.1.0.
[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 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index dc14cd775a..8972510018 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.
 ;;;
@@ -326,14 +327,13 @@ (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"))))
+        (base32 "024mwbapzy421sfwws60f04qh2709631spfpnf4r14w7wgmf9wn8"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -342,15 +342,16 @@ (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))
     (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.39.2

[bug#55474] [PATCH v3 02/17] gnu: python-django-filter: Update to 22.1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-filter): Update to 22.1.
[synopsis] Simpler synopsis.
[description] More precise description.
---
 gnu/packages/django.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 8972510018..365a7c1e58 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -472,13 +472,13 @@ (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"))))
+                "19abb7ikcjxfwggjh0bx40sx2dpv7q60bchva6r86zjgx1v3nizd"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -490,12 +490,12 @@ (define-public python-django-filter
      (list python-django python-django-rest-framework
            python-django-crispy-forms python-mock))
     (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.39.2

[bug#55474] [PATCH v3 03/17] gnu: Add python-django-modelcluster.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-modelcluster): New variable.
---
 gnu/packages/django.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 365a7c1e58..9d1b2ad831 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -800,6 +800,39 @@ (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 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~%")))))))
+    (propagated-inputs (list python-django python-pytz))
+    (native-inputs (list python-django-taggit))
+    (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.39.2

[bug#55474] [PATCH v3 04/17] gnu: Add python-django-treebeard.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-treebeard): New variable.
---
 gnu/packages/django.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 9d1b2ad831..02bb6d35f4 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -354,6 +354,47 @@ (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.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-treebeard" version))
+       (sha256
+        (base32 "1nk9b40cp0jsxr3qsb16mh9xr0z3cvf69yp5ahh70fajf8bh05c0"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (setenv "PYTHONPATH"
+                           (string-append ".:" (getenv "GUIX_PYTHONPATH")))
+                   (setenv "DJANGO_SETTINGS_MODULE" "treebeard.tests.settings")
+                   (substitute* "setup.py" ((".*pythonpath.*") ""))
+                   (invoke "pytest" "-vv"))
+                 (format #t "test suite not run~%")))))))
+    (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.39.2

[bug#55474] [PATCH v3 05/17] gnu: Add python-jinjalint.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jinjalint): New variable.
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 01480be482..e6164da5c7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4750,6 +4750,38 @@ (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 python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'lift-requirements
+           (lambda _
+             (substitute* "requirements.txt"
+               (("parsy==1.1.0.*") "parsy\n")
+               (("attrs==17.2.*") "attrs\n")
+               (("docopt==0.6.2.*") "docopt\n"))))
+         (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.39.2

[bug#55474] [PATCH v3 06/17] gnu: Add python-willow.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-willow): New variable.
---
 gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e6164da5c7..258c967e22 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7966,6 +7966,31 @@ (define-public python-pixelmatch
 metrics.")
     (license license:isc)))
 
+(define-public python-willow
+  (package
+    (name "python-willow")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Willow" version))
+       (sha256
+        (base32 "03ccxy5j3w5gsjz5nbnlya1drhga3gc2xxqbsi40pq1ihm9gzy0d"))))
+    (build-system python-build-system)
+    (inputs
+     (list freetype lcms libjpeg-turbo libtiff libwebp openjpeg zlib))
+    (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.39.2

[bug#55474] [PATCH v3 07/17] gnu: Add python-django-request.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-request): New variable.
---
 gnu/packages/django.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 02bb6d35f4..f97a75a1fd 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -259,6 +259,38 @@ (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.5.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-request" version))
+       (sha256
+        (base32 "0g5vj7kl5jn03m8h9jd0fpmhhvaywrhw01fcphcah4vf0y40ly00"))))
+    (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~%")))))))
+    (propagated-inputs
+     (list python-dateutil python-django python-six))
+    (native-inputs
+     (list python-sqlparse python-mock))
+    (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-simple-math-captcha
   (package
     (name "python-django-simple-math-captcha")
-- 
2.39.2

[bug#55474] [PATCH v3 08/17] gnu: Add python-django-environ.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-environ): New variable.
---
 gnu/packages/django.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f97a75a1fd..df3b886e05 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -190,6 +190,25 @@ (define-public python-django-2.2
 ;; 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-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 python-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.39.2

[bug#55474] [PATCH v3 09/17] gnu: Add python-draftjs-exporter.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-draftjs-exporter): New variable.
---
 gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 258c967e22..07c9732405 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8703,6 +8703,41 @@ (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 python-build-system)
+    (native-inputs (list python-beautifulsoup4
+                         python-html5lib
+                         python-lxml))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (invoke "python" "-m" "unittest" "discover"
+                     ;; disabling two unexpected failing tests FIXME
+                     "-k" "not test_export_lxml_big_content_export"
+                     "-k" "not test_export_lxml_entity_with_data-*")
+                 (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.39.2

[bug#55474] [PATCH v3 10/17] gnu: Add python-l18n.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-l18n): New variable.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 07c9732405..8fc15ef658 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1550,6 +1550,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 python-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.39.2

[bug#55474] [PATCH v3 11/17] gnu: Add python-parsy.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-parsy): New variable.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8fc15ef658..3cf3466ce3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3460,6 +3460,24 @@ (define-public python-parse
 syntax.")
     (license license:x11)))
 
+(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 python-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.39.2

[bug#55474] [PATCH v3 12/17] gnu: Add python-anyascii.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-anyascii): New variable.
---
 gnu/packages/python-xyz.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3cf3466ce3..73ff818c04 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -271,6 +271,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 python-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.39.2

[bug#55474] [PATCH v3 13/17] gnu: Add python-telepath.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-telepath): New variable.
---
 gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index df3b886e05..02897b02d7 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1539,3 +1539,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 python-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.39.2

[bug#55474] [PATCH v3 14/17] gnu: Add python-django-permissionedforms.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-permissionedforms): New variable.
---
 gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 02897b02d7..6bd4f5d578 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -787,6 +787,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 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~%")))))))
+    (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.39.2

[bug#55474] [PATCH v3 15/17] gnu: python-openpyxl: Update to 3.1.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-openpyxl): Update to 3.1.2.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 73ff818c04..cc4a8fe8f1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3011,7 +3011,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
@@ -3022,7 +3022,7 @@ (define-public python-openpyxl
              (changeset version)))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
-        (base32 "1p8xvc2gjw6zyzbd7qdvc3x178sm00ymrbyh9539l4fpzgxh0j9c"))))
+        (base32 "0dvfv8vbbaqzchhjiyripy7blbj4sc4zhpbh60zabkx2aix83jjh"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.39.2

[bug#55474] [PATCH v3 16/17] gnu: Add python-wagtail.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail): New variable.
---
 gnu/packages/django.scm | 65 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 6bd4f5d578..f546330c79 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1602,3 +1602,68 @@ (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 "4.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "wagtail" version))
+       (sha256
+        (base32 "1zsds12zl209b2nvgx4q4n187z00p106ajx0jcvkgz7zf6rn1kxk"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? inputs #:allow-other-keys)
+             (if tests?
+                 (lambda _
+                   (invoke "django-admin"
+                           "test" "--pythonpath=."
+                           "--settings=wagtail.tests.settings"
+                           ;; disabling failing 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"))))))))
+    (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))
+    (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.39.2

[bug#55474] [PATCH v3 17/17] gnu: Add python-wagtail-localize.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail-localize): New variable.
---
 gnu/packages/django.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f546330c79..6c5818c138 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -34,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 (gnu packages)
   #:use-module (gnu packages base)
@@ -1667,3 +1668,43 @@ (define-public python-wagtail
     (description "This package provides a Content Management System based on
 Django.")
     (license license:bsd-3)))
+
+(define-public python-wagtail-localize
+  (package
+    (name "python-wagtail-localize")
+    (version "1.5")
+    (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 "0vxd4852wc0qpindxi97nb1sgmdwf60bjc8kd8166p8lhlxgip38"))))
+    (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.39.2

[bug#55474] [PATCH v4 01/19] gnu: python-django-taggit: Update to 3.1.0.

[Nicolas Graves via Guix-patches via]

* 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 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b089954b6b..15b6366eb7 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 (gnu packages)
   #:use-module (gnu packages base)
@@ -326,15 +328,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
@@ -342,15 +343,16 @@ (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))
     (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

base-commit: 52e0a77a1b66e2ba5fa0dbac2f1dad35856d0586
-- 
2.40.1

[bug#55474] [PATCH v4 02/19] gnu: python-django-filter: Update to 22.1.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 15b6366eb7..aacc8423e7 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -471,14 +471,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
@@ -489,12 +489,12 @@ (define-public python-django-filter
      (list python-django python-django-rest-framework
            python-django-crispy-forms python-mock))
     (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.40.1

[bug#55474] [PATCH v4 03/19] gnu: Add python-django-modelcluster.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-modelcluster): New variable.
---
 gnu/packages/django.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index aacc8423e7..52203af30e 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -799,6 +799,39 @@ (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))
+    (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.40.1

[bug#55474] [PATCH v4 04/19] gnu: Add python-django-treebeard.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-treebeard): New variable.
---
 gnu/packages/django.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 52203af30e..12297314d3 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -355,6 +355,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.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-treebeard" version))
+       (sha256
+        (base32 "1nk9b40cp0jsxr3qsb16mh9xr0z3cvf69yp5ahh70fajf8bh05c0"))))
+    (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.40.1

[bug#55474] [PATCH v4 05/19] gnu: Add python-parsy.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-parsy): New variable.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e6a7367557..59ebc31de5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3845,6 +3845,24 @@ (define-public python-parse
 syntax.")
     (license license:x11)))
 
+(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.40.1

[bug#55474] [PATCH v4 06/19] gnu: Add python-jinjalint.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jinjalint): New variable.
---
 gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 59ebc31de5..2a1c8ec161 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5206,6 +5206,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.40.1

[bug#55474] [PATCH v4 07/19] gnu: Add python-willow.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-willow): New variable.
---
 gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2a1c8ec161..34adfded09 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8460,6 +8460,31 @@ (define-public python-pixelmatch
 metrics.")
     (license license:isc)))
 
+(define-public python-willow
+  (package
+    (name "python-willow")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Willow" version))
+       (sha256
+        (base32 "03ccxy5j3w5gsjz5nbnlya1drhga3gc2xxqbsi40pq1ihm9gzy0d"))))
+    (build-system pyproject-build-system)
+    (inputs
+     (list freetype lcms libjpeg-turbo libtiff libwebp openjpeg zlib))
+    (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.40.1

[bug#55474] [PATCH v4 08/19] gnu: Add python-django-request.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-request): New variable.
---
 gnu/packages/django.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 12297314d3..bd4307153d 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -260,6 +260,42 @@ (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.5.6")
+    (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
+         "07m4h6whi1zyc75ad22fmz25jhd9k3kf3jf73c4q07bqrclhfd6p"))))
+    (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))
+    (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-simple-math-captcha
   (package
     (name "python-django-simple-math-captcha")
-- 
2.40.1

[bug#55474] [PATCH v4 09/19] gnu: Add python-django-environ.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-environ): New variable.
---
 gnu/packages/django.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index bd4307153d..9020c6b5da 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -191,6 +191,25 @@ (define-public python-django-2.2
 ;; 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-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.40.1

[bug#55474] [PATCH v4 10/19] gnu: Add python-draftjs-exporter.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-draftjs-exporter): New variable.
---
 gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 34adfded09..8f064f5a92 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9197,6 +9197,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.40.1

[bug#55474] [PATCH v4 11/19] gnu: Add python-l18n.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-l18n): New variable.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8f064f5a92..546f05b3ff 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1778,6 +1778,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.40.1

[bug#55474] [PATCH v4 12/19] gnu: Add python-anyascii.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-anyascii): New variable.
---
 gnu/packages/python-xyz.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 546f05b3ff..cf00dea3be 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -275,6 +275,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.40.1

[bug#55474] [PATCH v4 13/19] gnu: Add python-telepath.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-telepath): New variable.
---
 gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 9020c6b5da..54aabcd0a3 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1531,3 +1531,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.40.1

[bug#55474] [PATCH v4 14/19] gnu: Add python-django-permissionedforms.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-permissionedforms): New variable.
---
 gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 54aabcd0a3..c379b8cca9 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -777,6 +777,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.40.1

[bug#55474] [PATCH v4 15/19] gnu: python-openpyxl: Update to 3.1.2.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cf00dea3be..763ef9a9de 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3344,7 +3344,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
@@ -3355,13 +3355,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.40.1

[bug#55474] [PATCH v4 16/19] gnu: python-django-4.0: Update to 4.0.9.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index c379b8cca9..4942371cb2 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -57,13 +57,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
-- 
2.40.1

[bug#55474] [PATCH v4 17/19] gnu: Add python-wagtail.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail): New variable.
---
 gnu/packages/django.scm | 70 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4942371cb2..235de8a015 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1594,3 +1594,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 "4.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "wagtail" version))
+       (sha256
+        (base32 "0424w36cb9kkxk19nq3x41z5hvyl0zsrh6dz0m1ws98p9qcldwab"))))
+    (build-system pyproject-build-system)
+    (arguments
+     `(#:test-flags '("--pythonpath=."
+                      "--settings=wagtail.tests.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.40.1

[bug#55474] [PATCH v4 18/19] gnu: Add python-wagtail-factories.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail-factories): New variable.
---
 gnu/packages/django.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 235de8a015..8a5f8471ab 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1664,3 +1664,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.40.1

[bug#55474] [PATCH v4 19/19] gnu: Add python-wagtail-localize.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail-localize): New variable.
---
 gnu/packages/django.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 8a5f8471ab..daa753e3cc 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1702,3 +1702,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")
+    (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 "0vxd4852wc0qpindxi97nb1sgmdwf60bjc8kd8166p8lhlxgip38"))))
+    (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.40.1

[bug#55474] [PATCH v5 01/55] gnu: python-django-4.0: Update to 4.0.9.

[Nicolas Graves via Guix-patches via]

* 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(-)

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: f25529b08e356f89ca7cecc44295085531a8faba
-- 
2.40.1

[bug#55474] [PATCH v5 02/55] gnu: python-asgiref: Update to 3.6.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6869eb0a8b..2a22d2b911 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.40.1

[bug#55474] [PATCH v5 03/55] gnu: Add python-asgiref-3.4.1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-asgiref-3.4.1): New variable.
---
 gnu/packages/python-web.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2a22d2b911..785ee0d03d 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.40.1

[bug#55474] [PATCH v5 04/55] gnu: python-distributed: Disable failing tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-science.scm (python-distributed): Disable failing tests.
---
 gnu/packages/python-science.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index a8e43d96cf..017f863532 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -1136,7 +1136,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]
@@ -1156,7 +1157,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.40.1

[bug#55474] [PATCH v5 05/55] gnu: Add python-django-4.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-4.2): New variable.
---
 gnu/packages/django.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

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.40.1

[bug#55474] [PATCH v5 06/55] gnu: python-pint: Disable failing tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-pint): Disable failing tests.
---
 gnu/packages/python-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b650b71f3b..7e8976fdea 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1149,7 +1149,9 @@ (define-public python-pint
               (sha256
                (base32
                 "0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
+    (arguments
+     '(#:test-flags '("-k" "not test_auto"))) ; PermissionError /homeless-shelter
     (native-inputs
      (list python-pytest                ;for pytest-subtests
            python-pytest-cov
-- 
2.40.1

[bug#55474] [PATCH v5 07/55] gnu: python-django-extensions: Update to 3.2.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 08/55] gnu: Add python-django-extensions-3.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

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 f5b6c8cd2f..fc54deba5f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8782,7 +8782,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.40.1

[bug#55474] [PATCH v5 09/55] gnu: python-django-3.1.14: Skip failing tests.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 10/55] gnu: python-django-simple-math-captcha: Update to 1.0.9-0-61adb4f.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 11/55] gnu: python-easy-thumbnails: Update to 2.8.5.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 12/55] gnu: python-django-filter: Add native-input tzdata-for-tests.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 13/55] gnu: python-django-allauth: Update to 0.47.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 14/55] gnu: python-django-debug-toolbar: Add native-input tzdata-for-tests.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 15/55] gnu: python-django-picklefield: Update to 3.1.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 16/55] gnu: Remove python-django-2.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-2.2): Delete variable.
---
 gnu/packages/django.scm | 15 ---------------
 1 file changed, 15 deletions(-)

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.40.1

[bug#55474] [PATCH v5 17/55] gnu: datasette: Disabling failing tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/databases.scm (datasette): Disabling failing tests.
---
 gnu/packages/databases.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 42b394daf2..510a1c5c85 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5141,7 +5141,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.40.1

[bug#55474] [PATCH v5 18/55] gnu: graphite-web: Update to 1.1.10-0-dca59dc.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index ce41791672..1ca6134e3f 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.40.1

[bug#55474] [PATCH v5 19/55] gnu: python-django-contact-form: Add native-input tzdata-for-tests.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 20/55] gnu: python-django-contrib-comments: Update to 2.2.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 21/55] gnu: python-dango-rq: Add native-input tzdata-for-tests.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 22/55] gnu: python-django-sortedm2m: Replace input python-django by python-django-3.2.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 23/55] gnu: python-django-tagging: Add patch for django@4 support.

[Nicolas Graves via Guix-patches via]

* 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

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.40.1

[bug#55474] [PATCH v5 24/55] gnu: python-django-sortedm2m: Update to 3.1.1-0-ddf321f.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 25/55] gnu: python-defusedxml: Update to 0.7.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/xml.scm (python-defusedxml): Update to 0.7.0.
---
 gnu/packages/xml.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 8d9974b825..0633406493 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1439,14 +1439,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.40.1

[bug#55474] [PATCH v5 26/55] gnu: python-filetype: Update to 1.0.10.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7e8976fdea..d9fa8620de 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13810,13 +13810,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.40.1

[bug#55474] [PATCH v5 27/55] gnu: python-rcssmin: Update to 1.1.1.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d9fa8620de..97ccaff1a2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20533,21 +20533,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.40.1

[bug#55474] [PATCH v5 28/55] gnu: python-rjsmin: Update to 1.2.1.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 97ccaff1a2..374b550c40 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20552,38 +20552,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.40.1

[bug#55474] [PATCH v5 29/55] gnu: python-django-mailman3: Update to 1.3.8.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 801555803a..bf26215151 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3555,29 +3555,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.40.1

[bug#55474] [PATCH v5 30/55] gnu: Remove python-pysolr.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-web.scm (python-pysolr): Delete variable.
---
 gnu/packages/python-web.scm | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 785ee0d03d..8a05fa8d53 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6640,31 +6640,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.40.1

[bug#55474] [PATCH v5 31/55] gnu: python-django-compressor: Update to 4.3.1.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 32/55] gnu: python-django-haystack: Update to 3.2.1.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 33/55] gnu: python-hyperkitty: Update to 1.3.7.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index bf26215151..67d1e39dcd 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3614,15 +3614,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
@@ -3649,11 +3648,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.40.1

[bug#55474] [PATCH v5 34/55] gnu: Add python-django-requests-debug-toolbar.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-requests-debug-toolbar): New variable.
---
 gnu/packages/django.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

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.40.1

[bug#55474] [PATCH v5 35/55] gnu: postorius: Update to 1.3.7.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 67d1e39dcd..8865bea991 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3666,15 +3666,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
@@ -3684,13 +3683,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.40.1

[bug#55474] [PATCH v5 36/55] gnu: python-django-rest-framework: Update to 3.14.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 37/55] gnu: python-django: Update default version to 4.0.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django): Update default version to 4.0.
---
 gnu/packages/django.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.40.1

[bug#55474] [PATCH v5 38/55] gnu: python-django-taggit: Update to 3.1.0.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 39/55] gnu: python-django-filter: Update to 22.1.

[Nicolas Graves via Guix-patches via]

* 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(-)

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.40.1

[bug#55474] [PATCH v5 40/55] gnu: Add python-django-modelcluster.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-modelcluster): New variable.
---
 gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

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.40.1

[bug#55474] [PATCH v5 41/55] gnu: Add python-django-treebeard.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-treebeard): New variable.
---
 gnu/packages/django.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

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.40.1

[bug#55474] [PATCH v5 42/55] gnu: Add python-parsy.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-parsy): New variable.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 374b550c40..fe0384b522 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3886,6 +3886,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.40.1

[bug#55474] [PATCH v5 43/55] gnu: Add python-jinjalint.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jinjalint): New variable.
---
 gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fe0384b522..942aaf8339 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5348,6 +5348,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.40.1

[bug#55474] [PATCH v5 44/55] gnu: Add python-willow.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-willow): New variable.
---
 gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 942aaf8339..a505512aaa 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8602,6 +8602,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.40.1

[bug#55474] [PATCH v5 45/55] gnu: Add python-django-request.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-request): New variable.
---
 gnu/packages/django.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

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.40.1

[bug#55474] [PATCH v5 46/55] gnu: Add python-django-environ.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-environ): New variable.
---
 gnu/packages/django.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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.40.1

[bug#55474] [PATCH v5 47/55] gnu: Add python-draftjs-exporter.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-draftjs-exporter): New variable.
---
 gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a505512aaa..4510a853e4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9341,6 +9341,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.40.1

[bug#55474] [PATCH v5 48/55] gnu: Add python-l18n.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-l18n): New variable.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4510a853e4..cb29cc3311 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1802,6 +1802,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.40.1

[bug#55474] [PATCH v5 49/55] gnu: Add python-anyascii.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-xyz.scm (python-anyascii): New variable.
---
 gnu/packages/python-xyz.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cb29cc3311..57b4cad561 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -276,6 +276,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.40.1

[bug#55474] [PATCH v5 50/55] gnu: Add python-telepath.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-telepath): New variable.
---
 gnu/packages/django.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

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.40.1

[bug#55474] [PATCH v5 51/55] gnu: Add python-django-permissionedforms.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-django-permissionedforms): New variable.
---
 gnu/packages/django.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

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.40.1

[bug#55474] [PATCH v5 52/55] gnu: python-openpyxl: Update to 3.1.2.

[Nicolas Graves via Guix-patches via]

* 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(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 57b4cad561..da1cea675d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3352,7 +3352,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
@@ -3363,13 +3363,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.40.1

[bug#55474] [PATCH v5 53/55] gnu: Add python-wagtail.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail): New variable.
---
 gnu/packages/django.scm | 70 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

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.40.1

[bug#55474] [PATCH v5 54/55] gnu: Add python-wagtail-factories.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail-factories): New variable.
---
 gnu/packages/django.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

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.40.1

[bug#55474] [PATCH v5 55/55] gnu: Add python-wagtail-localize.

[Nicolas Graves via Guix-patches via]

* gnu/packages/django.scm (python-wagtail-localize): New variable.
---
 gnu/packages/django.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

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.40.1