unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Marius Bakke <marius@gnu.org>
To: 43354@debbugs.gnu.org
Subject: [bug#43354] [PATCH 04/55] gnu: python-pytest-django: Update to 3.9.0.
Date: Sat, 12 Sep 2020 16:28:20 +0200	[thread overview]
Message-ID: <20200912142911.6231-4-marius@gnu.org> (raw)
In-Reply-To: <20200912142911.6231-1-marius@gnu.org>

* gnu/packages/django.scm (python-pytest-django): Update to 3.9.0.
[arguments]: Remove #:tests?.  Add phase to run custom tests.
[native-inputs]: Add PYTHON-PYTEST-XDIST and PYTHON-SQLPARSE.
---
 gnu/packages/django.scm | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b3abb17277..30716dd286 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -309,26 +309,49 @@ size and quality.")
 (define-public python-pytest-django
   (package
     (name "python-pytest-django")
-    (version "3.1.2")
+    (version "3.9.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "pytest-django" version))
               (sha256
                (base32
-                "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"))))
+                "1yds71ppg39whs7pvlbwxfglm0jxyawh33rq34jihpif4i15ykk6"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f ; FIXME: How to run tests?
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-setuppy
-           (lambda _
-             (substitute* "setup.py"
-                          (("setuptools_scm==1.11.1") "setuptools_scm"))
+         (replace 'check
+           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+             (if tests?
+                 (begin
+                   ;; Adjust for Django 3.1, can be removed for versions >= 3.10.0.
+                   (substitute* "tests/test_fixtures.py"
+                     (("from django\\.conf\\.urls import url")
+                      "from django.urls import path")
+                     (("url\\(r'admin")
+                      "path('admin"))
+                   (add-installed-pythonpath inputs outputs)
+                   (setenv "PYTHONPATH"
+                           (string-append ".:" ;for pytest_django_test
+                                          (getenv "PYTHONPATH")))
+                   (setenv "PYTEST_DJANGO_TEST_RUNNER" "pytest")
+                   (setenv "DJANGO_SETTINGS_MODULE"
+                           "pytest_django_test.settings_sqlite_file")
+                   (invoke "pytest" "-vv" "-k"
+                           ;; FIXME: the settings modules fails to locate templates.
+                           (string-append "not test_django_not_loaded_without_settings"
+                                          " and not test_settings"
+                                          ;; XXX: Incompatible with Django 3.1?
+                                          " and not test_urls_cache_is_cleared")))
+                 (format #t "test suite not run~%"))
              #t)))))
     (native-inputs
      `(("python-django" ,python-django)
-       ("python-setuptools-scm" ,python-setuptools-scm)))
+       ("python-setuptools-scm" ,python-setuptools-scm)
+
+       ;; For tests.
+       ("python-pytest-xdist" ,python-pytest-xdist)
+       ("python-sqlparse" ,python-sqlparse)))  ;XXX: really a Django dependency
     (propagated-inputs
      `(("python-pytest" ,python-pytest)))
     (home-page "https://pytest-django.readthedocs.org/")
-- 
2.28.0





  parent reply	other threads:[~2020-09-12 14:30 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-12 14:26 [bug#43354] [PATCH 00/55] Django upgrade Marius Bakke
2020-09-12 14:28 ` [bug#43354] [PATCH 01/55] gnu: Add python-asgiref Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 02/55] gnu: python-django: Update to 3.1.1 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 03/55] gnu: python-django: Propagate python-sqlparse Marius Bakke
2020-09-12 14:28   ` Marius Bakke [this message]
2020-09-12 14:28   ` [bug#43354] [PATCH 05/55] gnu: python-django-simple-math-captcha: Update to 1.0.9 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 06/55] gnu: python-django-classy-tags: Update to 2.0.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 07/55] gnu: python-django-extensions: Update to 3.0.6 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 08/55] gnu: python-django-taggit: Update to 1.3.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 09/55] gnu: python-django-crispy-forms: Update to 1.9.2 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 10/55] gnu: python-djangorestframework: Update to 3.11.1 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 11/55] gnu: python-django-filter: Update to 2.3.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 12/55] gnu: python-django-allauth: Update to 0.42.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 13/55] gnu: Add python-css-html-js-minify Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 14/55] gnu: python-django-pipeline: Update to 2.0.5 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 15/55] gnu: python-django-jinja: Update to 2.6.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 16/55] gnu: python-django-debug-toolbar: Update to 2.2 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 17/55] gnu: python-django-gravatar2: Update to 1.4.4 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 18/55] gnu: python-webassets: Update to 2.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 19/55] gnu: python-django-assets: " Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 20/55] gnu: python-dj-database-url: Update to 0.5.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 21/55] gnu: python-django-picklefield: Update to 3.0.1 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 22/55] gnu: python-django-bulk-update: Update to 2.2.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 23/55] gnu: python-django-contact-form: Update to 1.8.1 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 24/55] gnu: python-django-contrib-comments: Update to 1.9.2 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 25/55] gnu: python-django-redis: Update to 4.12.1 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 26/55] gnu: python-redis: Update to 3.5.3 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 27/55] gnu: python-rq: Update to 1.5.1 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 28/55] gnu: Add python-croniter Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 29/55] gnu: Add python-rq-scheduler Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 30/55] gnu: python-django-rq: Update to 2.3.2 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 31/55] gnu: python-django-q: Update to 1.3.3 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 32/55] gnu: python-django-sortedm2m: Update to 3.0.2 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 33/55] gnu: python-django-appconf: Update to 1.0.4 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 34/55] gnu: python-django-statici18n: Update to 1.9.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 35/55] gnu: python-django-sekizai: Update to 2.0.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 36/55] gnu: python-django-override-storage: Update to 0.3.0 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 37/55] gnu: python-ldap: Update to 3.3.1 Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 38/55] gnu: Add python-django-auth-ldap Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 39/55] gnu: Add python-django-logging-json Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 40/55] gnu: Add python-django-netfields Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 41/55] gnu: Add python-sqlalchemy-mock Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 42/55] gnu: Add python-jsonplus Marius Bakke
2020-09-12 14:28   ` [bug#43354] [PATCH 43/55] gnu: Add python-django-debug-toolbar-alchemy Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 44/55] gnu: Add python-django-url-filter Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 45/55] gnu: Remove pootle Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 46/55] gnu: Remove python2-django-mailman3 Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 47/55] gnu: python2-graphite-web: Update to 1.1.7 Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 48/55] gnu: Remove python2 versions of Django packages Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 49/55] gnu: Deprecate python-django-jsonfield Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 50/55] gnu: Remove python-django-overextends Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 51/55] gnu: Django packages no longer propagates Django Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 52/55] gnu: python-mysqlclient: Remove unused inputs Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 53/55] gnu: python-mysqlclient: Update to 2.0.1 Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 54/55] gnu: Remove python2-mysqlclient Marius Bakke
2020-09-12 14:29   ` [bug#43354] [PATCH 55/55] gnu: patchwork: Update to 2.2.2 Marius Bakke
2020-09-22 16:45 ` bug#43354: [PATCH 00/55] Django upgrade Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200912142911.6231-4-marius@gnu.org \
    --to=marius@gnu.org \
    --cc=43354@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).