gnu: python-pytest-django: Use HTTPS home page.

[jackhill/guix/guix.git] / gnu / packages / django.scm

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index bce8444..0652ea1 100644 (file)
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1,10 +1,11 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>

-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017 ng0 <ng0@n0.is>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>

 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>

+;;; Copyright © 2019 Sam <smbaines8@gmail.com>

 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ -25,6 +26,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)

+  #:use-module (guix git-download)

   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)


@@ -33,18 +35,20 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)

-  #:use-module (gnu packages time))
+  #:use-module (gnu packages sphinx)
+  #:use-module (gnu packages time)
+  #:use-module (gnu packages xml))

 
 (define-public python-django
   (package
     (name "python-django")
 
 (define-public python-django
   (package
     (name "python-django")

-    (version "1.11.20")
+    (version "1.11.28")

     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32

-                "0h90kdq8r4y8wa73hdxmyy5psnwlg61dcq3qsa098cpfiyh9vaa3"))))
+                "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k"))))

     (build-system python-build-system)
     (arguments
      '(#:modules ((srfi srfi-1)
     (build-system python-build-system)
     (arguments
      '(#:modules ((srfi srfi-1)


@@ -119,6 +123,46 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
          ;; required.
          ,@(package-native-inputs base))))))
 
          ;; required.
          ,@(package-native-inputs base))))))
 

+(define-public python-django-extensions
+  (package
+    (name "python-django-extensions")
+    (version "2.1.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.git")
+             (commit version)))
+       (file-name (string-append name "-" version))
+       (sha256
+        (base32
+         "0p4qrdinrv6indczlc8dcnm528i5fzmcn9xk1ja7ycfkyk5x6j5w"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ;TODO collected 378 items / 3 errors / 1 skipped
+    (propagated-inputs
+     `(("python-six" ,python-six)
+       ("python-vobject" ,python-vobject)
+       ("python-werkzeug" ,python-werkzeug)
+       ("python-dateutil" ,python-dateutil)
+       ("python-django" ,python-django)))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-factory-boy" ,python-factory-boy)
+       ("python-tox" ,python-tox)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)
+       ("python-pytest-django" ,python-pytest-django)
+       ("python-shortuuid" , python-shortuuid)))
+    (home-page
+     "https://github.com/django-extensions/django-extensions")
+    (synopsis "Custom management extensions for Django")
+    (description
+     "Django-extensions extends Django providing, for example, management
+commands, additional database fields and admin extensions.")
+    (license license:expat)))
+

 (define-public python-django-simple-math-captcha
   (package
     (name "python-django-simple-math-captcha")
 (define-public python-django-simple-math-captcha
   (package
     (name "python-django-simple-math-captcha")


@@ -147,6 +191,38 @@ with arguments to the field constructor.")
 (define-public python2-django-simple-math-captcha
   (package-with-python2 python-django-simple-math-captcha))
 
 (define-public python2-django-simple-math-captcha
   (package-with-python2 python-django-simple-math-captcha))
 

+(define-public python-django-taggit
+  (package
+    (name "python-django-taggit")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "django-taggit" version))
+       (sha256
+        (base32
+         "044fzcpmns90kaxdi49qczlam4xsi8rl73rpfwvxx1gkcqzidgq1"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "python3" "-m" "django" "test" "--settings=tests.settings"))))))
+    (propagated-inputs
+     `(("python-django" ,python-django)
+       ("python-isort" ,python-isort)))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-mock" ,python-mock)))
+    (home-page
+     "https://github.com/jazzband/django-taggit")
+    (synopsis
+     "Reusable Django application for simple tagging")
+    (description
+     "Django-taggit is a reusable Django application for simple tagging.")
+    (license license:bsd-3)))
+

 (define-public python-pytest-django
   (package
     (name "python-pytest-django")
 (define-public python-pytest-django
   (package
     (name "python-pytest-django")


@@ -172,7 +248,7 @@ with arguments to the field constructor.")
        ("python-setuptools-scm" ,python-setuptools-scm)))
     (propagated-inputs
      `(("python-pytest" ,python-pytest)))
        ("python-setuptools-scm" ,python-setuptools-scm)))
     (propagated-inputs
      `(("python-pytest" ,python-pytest)))

-    (home-page "http://pytest-django.readthedocs.org/")
+    (home-page "https://pytest-django.readthedocs.org/")

     (synopsis "Django plugin for py.test")
     (description "Pytest-django is a plugin for py.test that provides a set of
 useful tools for testing Django applications and projects.")
     (synopsis "Django plugin for py.test")
     (description "Pytest-django is a plugin for py.test that provides a set of
 useful tools for testing Django applications and projects.")


@@ -218,14 +294,14 @@ them do this.")
 (define-public python-django-allauth
   (package
     (name "python-django-allauth")
 (define-public python-django-allauth
   (package
     (name "python-django-allauth")

-    (version "0.30.0")
+    (version "0.39.1")

     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-allauth" version))
        (sha256
         (base32
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-allauth" version))
        (sha256
         (base32

-         "1fslqc5qqb0b66yscvkyjwfv8cnbfx5nlkpnwimyb3pf1nc1w7r3"))))
+         "17l0acpr3cihdndzccjhgv58f9z170v2qwx7w0b8w6235x646i24"))))

     (build-system python-build-system)
     (arguments
      '(#:phases
     (build-system python-build-system)
     (arguments
      '(#:phases


@@ -234,19 +310,20 @@ them do this.")
          (add-before 'check 'skip-test-requiring-network-access
            (lambda _
              (substitute* "allauth/socialaccount/providers/openid/tests.py"
          (add-before 'check 'skip-test-requiring-network-access
            (lambda _
              (substitute* "allauth/socialaccount/providers/openid/tests.py"

+               (("import override_settings") "import tag, override_settings")

                (("def test_login")
                (("def test_login")

-                "from django.test import tag
-    @tag('requires-web')
+                "@tag('requires-web')

     def test_login"))))
          (replace 'check
            (lambda _
     def test_login"))))
          (replace 'check
            (lambda _

+             ;; TODO: investigate why this test fails
+             (delete-file "allauth/socialaccount/providers/cern/tests.py")

              (setenv "DJANGO_SETTINGS_MODULE" "test_settings")
              (setenv "DJANGO_SETTINGS_MODULE" "test_settings")

-             (zero? (system*
-                     "django-admin"
+             (invoke "django-admin"

                      "test"
                      "allauth"
                      "--verbosity=2"
                      "test"
                      "allauth"
                      "--verbosity=2"

-                     "--exclude-tag=requires-web")))))))
+                     "--exclude-tag=requires-web"))))))

     (propagated-inputs
      `(("python-openid" ,python-openid)
        ("python-requests" ,python-requests)
     (propagated-inputs
      `(("python-openid" ,python-openid)
        ("python-requests" ,python-requests)


@@ -272,14 +349,14 @@ account authentication.")
     (version "1.10.1")
     (source
      (origin
     (version "1.10.1")
     (source
      (origin

-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/jazzband/django-debug-toolbar/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/jazzband/django-debug-toolbar.git")
+             (commit version)))
+       (file-name (git-file-name name version))

        (sha256
         (base32
        (sha256
         (base32

-         "1rww056hyzks8spbgf4h7kf6ybxlc5p08a2b6gn1nqrrzs4yx9sy"))))
+         "0zr6yjsms97wlvvd17rdbrx01irkg887dn9x70c1hzfjmfvp9afk"))))

     (build-system python-build-system)
     (propagated-inputs
      `(("python-sqlparse" ,python-sqlparse)
     (build-system python-build-system)
     (propagated-inputs
      `(("python-sqlparse" ,python-sqlparse)


@@ -380,14 +457,14 @@ merging, minifying and compiling CSS and Javascript files.")
     (version "2.4.1")
     (source
      (origin
     (version "2.4.1")
     (source
      (origin

-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/niwinz/django-jinja/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/niwinz/django-jinja.git")
+             (commit version)))
+       (file-name (git-file-name name version))

        (sha256
         (base32
        (sha256
         (base32

-         "0bzrb4m6wx9ph5cpvz7wpvg5k6ksvj0dnxlg0nhhqskhvp46brs1"))))
+         "1fcrxlznlq1xvl26y3j1r22vvy6m08r5l97xi2wj50rdmxhfvhis"))))

     (build-system python-build-system)
     (propagated-inputs
      `(("python-django" ,python-django)
     (build-system python-build-system)
     (propagated-inputs
      `(("python-django" ,python-django)


@@ -518,9 +595,9 @@ project aims to bulk update given objects using one query over Django ORM.")
          (replace 'check
            (lambda _
              ;; the next version will need "make test"
          (replace 'check
            (lambda _
              ;; the next version will need "make test"

-             (and (zero? (system* "flake8" "contact_form"))
-                  (zero? (system* "coverage" "run" "contact_form/runtests.py"))
-                  (zero? (system* "coverage" "report" "-m" "--fail-under" "0"))))))))
+             (invoke "flake8" "contact_form")
+             (invoke "coverage" "run" "contact_form/runtests.py")
+             (invoke "coverage" "report" "-m" "--fail-under" "0"))))))

     (native-inputs
      `(("python-coverage" ,python-coverage)
        ("python-flake8" ,python-flake8)))
     (native-inputs
      `(("python-coverage" ,python-coverage)
        ("python-flake8" ,python-flake8)))


@@ -576,8 +653,7 @@ entries, photos, book chapters, or anything else.")
      `(#:phases
        (modify-phases %standard-phases
          (replace 'check
      `(#:phases
        (modify-phases %standard-phases
          (replace 'check

-           (lambda _
-             (zero? (system* "./test_project/manage.py" "test")))))))
+           (lambda _ (invoke "./test_project/manage.py" "test"))))))

     (propagated-inputs
      `(("python-django" ,python-django)))
     (native-inputs
     (propagated-inputs
      `(("python-django" ,python-django)))
     (native-inputs


@@ -620,6 +696,9 @@ project.")
              (or
               (not tests?)
               (begin
              (or
               (not tests?)
               (begin

+                (setenv "PYTHONPATH"
+                        (string-append (getcwd) ":"
+                                       (getenv "PYTHONPATH")))

                 (setenv "DJANGO_SETTINGS_MODULE" "tests.settings")
                 (invoke "django-admin" "test" "tests"))))))))
     (propagated-inputs
                 (setenv "DJANGO_SETTINGS_MODULE" "tests.settings")
                 (invoke "django-admin" "test" "tests"))))))))
     (propagated-inputs


@@ -638,22 +717,22 @@ support, and optional data-URI image and font embedding.")
 (define-public python-django-redis
   (package
     (name "python-django-redis")
 (define-public python-django-redis
   (package
     (name "python-django-redis")

-    (version "4.7.0")
+    (version "4.10.0")

     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-redis" version))
               (sha256
                (base32
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-redis" version))
               (sha256
                (base32

-                "0yyyxv8n9l9dhs893jsqwg2cxqkkc79g719n9dzzzqgkzialv1c1"))))
+                "1rxcwnv9ik0swkwvfqdi9i9baw6n8if5pj6q63fjh4p9chw3j2xg"))))

     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (replace 'check
            (lambda _
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (replace 'check
            (lambda _

-             (and (zero? (system* "redis-server" "--daemonize" "yes"))
-                  (with-directory-excursion "tests"
-                    (zero? (system* "python" "runtests.py")))))))))
+             (invoke "redis-server" "--daemonize" "yes")
+             (with-directory-excursion "tests"
+               (invoke "python" "runtests.py")))))))

     (native-inputs
      `(("python-fakeredis" ,python-fakeredis)
        ("python-hiredis" ,python-hiredis)
     (native-inputs
      `(("python-fakeredis" ,python-fakeredis)
        ("python-hiredis" ,python-hiredis)


@@ -675,25 +754,26 @@ support, and optional data-URI image and font embedding.")
 (define-public python-django-rq
   (package
     (name "python-django-rq")
 (define-public python-django-rq
   (package
     (name "python-django-rq")

-    (version "0.9.4")
+    (version "1.3.1")

     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-rq" version))
               (sha256
                (base32
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-rq" version))
               (sha256
                (base32

-                "04v8ilfdp10bk31fxgh4cn083gsn5m06342cnpm5d10nd8hc0vky"))))
+                "1ips1ikv5qhgwb58ssn496vgqg9qv6jinwmwbrg9l3s75fskd1l5"))))

     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (replace 'check
            (lambda _
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (replace 'check
            (lambda _

-             (and (zero? (system* "redis-server" "--daemonize" "yes"))
-                  (zero? (system* "django-admin.py" "test" "django_rq"
-                                  "--settings=django_rq.test_settings"
-                                  "--pythonpath="))))))))
+             (invoke "redis-server" "--daemonize" "yes")
+             (invoke "django-admin.py" "test" "django_rq"
+                     "--settings=django_rq.tests.settings"
+                     "--pythonpath="))))))

     (native-inputs
     (native-inputs

-     `(("redis" ,redis)))
+     `(("python-mock" ,python-mock)
+       ("redis" ,redis)))

     (propagated-inputs
      `(("python-django" ,python-django)
        ("python-rq" ,python-rq)))
     (propagated-inputs
      `(("python-django" ,python-django)
        ("python-rq" ,python-rq)))


@@ -738,16 +818,17 @@ the order of added relations.")
 (define-public python-django-appconf
   (package
     (name "python-django-appconf")
 (define-public python-django-appconf
   (package
     (name "python-django-appconf")

-    (version "1.0.2")
+    (version "1.0.3")

     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-appconf" version))
               (sha256
                (base32
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "django-appconf" version))
               (sha256
                (base32

-                "0qdjdx35g66xjsc50v0c5h3kg6njs8df33mbjx6j4k1vd3m9lkba"))))
+                "1qw0p9qh78bvkgi38ba58djwn0rd5j1lrkg2c2wk5wb7snj3rw9m"))))

     (build-system python-build-system)
     (propagated-inputs
     (build-system python-build-system)
     (propagated-inputs

-     `(("python-django" ,python-django)))
+     `(("python-django" ,python-django)
+       ("python-six" ,python-six)))

     (home-page "https://github.com/django-compressor/django-appconf")
     (synopsis "Handle configuration defaults of packaged Django apps")
     (description
     (home-page "https://github.com/django-compressor/django-appconf")
     (synopsis "Handle configuration defaults of packaged Django apps")
     (description


@@ -788,14 +869,14 @@ static files.")
 (define-public pootle
   (package
     (name "pootle")
 (define-public pootle
   (package
     (name "pootle")

-    (version "2.8.0rc5")
+    (version "2.8.2")

     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "Pootle" version ".tar.bz2"))
         (sha256
          (base32
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "Pootle" version ".tar.bz2"))
         (sha256
          (base32

-          "0m6qcpkcy22dk3ad5y2k8851kqg2w6vrkywgy4vabwbacd7r1mvn"))))
+          "1ng8igq0alsqzasgxdh3fb23581anyzp121h9041pwdzzv98kn4m"))))

     (build-system python-build-system)
     (arguments
      `(; pootle supports only python2.
     (build-system python-build-system)
     (arguments
      `(; pootle supports only python2.


@@ -849,7 +930,7 @@ static files.")
        ("python2-pytest-catchlog" ,python2-pytest-catchlog)
        ("python2-pytest-cov" ,python2-pytest-cov)
        ("python2-factory-boy" ,python2-factory-boy)))
        ("python2-pytest-catchlog" ,python2-pytest-catchlog)
        ("python2-pytest-cov" ,python2-pytest-cov)
        ("python2-factory-boy" ,python2-factory-boy)))

-    (home-page "http://pootle.translatehouse.org/")
+    (home-page "https://pootle.translatehouse.org/")

     (synopsis "Community localization server")
     (description
       "Pootle is an online translation and localization tool.  It works to
     (synopsis "Community localization server")
     (description
       "Pootle is an online translation and localization tool.  It works to


@@ -931,14 +1012,13 @@ forms using your favorite CSS framework, without writing template code.")
 (define-public python-django-override-storage
   (package
     (name "python-django-override-storage")
 (define-public python-django-override-storage
   (package
     (name "python-django-override-storage")

-    (version "0.1.4")
+    (version "0.1.6")

     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-override-storage" version))
        (sha256
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django-override-storage" version))
        (sha256

-        (base32
-         "0sqz1mh0yn8b1bzz2gr2azfiynljigm5gkzavp5n17zd3j2jg57x"))))
+        (base32 "022arq94lxnlyykn8wvfnkykhi2dldnsn93pa2i41na551i0wpiv"))))

     (build-system python-build-system)
     (propagated-inputs
      `(("python-django" ,python-django)))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-django" ,python-django)))