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 48/55] gnu: Remove python2 versions of Django packages.
Date: Sat, 12 Sep 2020 16:29:04 +0200	[thread overview]
Message-ID: <20200912142911.6231-48-marius@gnu.org> (raw)
In-Reply-To: <20200912142911.6231-1-marius@gnu.org>

Python 2 is EOL and not supported by current versions of Django.

* gnu/packages/django.scm (python-django, python-django-tagging)[properties]:
Remove PYTHON2-VARIANT.
* gnu/packages/django.scm (python2-django, python2-django-simple-math-captcha,
python2-pytest-django, python2-django-filter, python2-django-allauth,
python2-django-gravatar2, python2-django-assets, python2-django-jsonfield,
python2-dj-database-url, python2-django-bulk-update,
python2-django-contact-form, python2-django-contrib-comments,
python2-django-overextends, python2-django-redis, python2-django-rq,
python2-django-sortedm2m, python2-django-appconf, python2-django-statici18n,
python2-django-tagging): Remove variables.
---
 gnu/packages/django.scm | 82 +----------------------------------------
 1 file changed, 1 insertion(+), 81 deletions(-)

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 1ce5371e39..d23c6fdaa2 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -127,21 +127,7 @@ development and clean, pragmatic design.  It provides many tools for building
 any Web site.  Django focuses on automating as much as possible and adhering
 to the @dfn{don't repeat yourself} (DRY) principle.")
     (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-django))
-                  (cpe-name . "django")))))
-
-(define-public python2-django
-  (let ((base (package-with-python2 (strip-python2-variant python-django))))
-    (package
-      (inherit base)
-      (native-inputs
-       `(;; Test requirements for Python 2 taken from
-         ;; tests/requirements/py3.txt: enum34 and mock.
-         ("python2-enum34" ,python2-enum34)
-         ("python2-mock" ,python2-mock)
-         ;; When adding memcached mind: for Python 2 memcached <= 1.53 is
-         ;; required.
-         ,@(package-native-inputs base))))))
+    (properties `((cpe-name . "django")))))
 
 (define-public python-django-2.2
   (package
@@ -239,9 +225,6 @@ with no settings.py configuration necessary, but instead can be configured
 with arguments to the field constructor.")
     (license license:asl2.0)))
 
-(define-public python2-django-simple-math-captcha
-  (package-with-python2 python-django-simple-math-captcha))
-
 (define-public python-django-classy-tags
   (package
     (name "python-django-classy-tags")
@@ -377,9 +360,6 @@ size and quality.")
 useful tools for testing Django applications and projects.")
     (license license:bsd-3)))
 
-(define-public python2-pytest-django
-  (package-with-python2 python-pytest-django))
-
 (define-public python-django-haystack
   (package
     (name "python-django-haystack")
@@ -459,9 +439,6 @@ filter down a queryset based on a model’s fields, displaying the form to let
 them do this.")
     (license license:bsd-3)))
 
-(define-public python2-django-filter
-  (package-with-python2 python-django-filter))
-
 (define-public python-django-allauth
   (package
     (name "python-django-allauth")
@@ -498,9 +475,6 @@ registration, account management as well as 3rd party (social)
 account authentication.")
     (license license:expat)))
 
-(define-public python2-django-allauth
-  (package-with-python2 python-django-allauth))
-
 (define-public python-django-debug-toolbar
   (package
     (name "python-django-debug-toolbar")
@@ -586,9 +560,6 @@ queries done via the Django ORM, SQLAlchemy generated queries are displayed.")
 templatetags and a full test suite.")
     (license license:expat)))
 
-(define-public python2-django-gravatar2
-  (package-with-python2 python-django-gravatar2))
-
 (define-public python-django-assets
   (package
     (name "python-django-assets")
@@ -613,9 +584,6 @@ files.  Integrates the webassets library with Django, adding support for
 merging, minifying and compiling CSS and Javascript files.")
     (license license:bsd-2)))
 
-(define-public python2-django-assets
-  (package-with-python2 python-django-assets))
-
 (define-public python-django-jinja
   (package
     (name "python-django-jinja")
@@ -685,9 +653,6 @@ validated JSON in your model.  It silently takes care of serialization.  To
 use, simply add the field to one of your models.")
     (license license:expat)))
 
-(define-public python2-django-jsonfield
-  (package-with-python2 python-django-jsonfield))
-
 (define-public python-dj-database-url
   (package
     (name "python-dj-database-url")
@@ -710,9 +675,6 @@ dictionary, populated with all the data specified in your URL.  There is also a
 conn_max_age argument to easily enable Django’s connection pool.")
     (license license:bsd-2)))
 
-(define-public python2-dj-database-url
-  (package-with-python2 python-dj-database-url))
-
 (define-public python-django-picklefield
   (package
     (name "python-django-picklefield")
@@ -764,9 +726,6 @@ conn_max_age argument to easily enable Django’s connection pool.")
 project aims to bulk update given objects using one query over Django ORM.")
     (license license:expat)))
 
-(define-public python2-django-bulk-update
-  (package-with-python2 python-django-bulk-update))
-
 (define-public python-django-contact-form
   (package
     (name "python-django-contact-form")
@@ -799,9 +758,6 @@ project aims to bulk update given objects using one query over Django ORM.")
 for Django sites.")
     (license license:bsd-3)))
 
-(define-public python2-django-contact-form
-  (package-with-python2 python-django-contact-form))
-
 (define-public python-django-contrib-comments
   (package
     (name "python-django-contrib-comments")
@@ -824,9 +780,6 @@ used to attach comments to any model, so you can use it for comments on blog
 entries, photos, book chapters, or anything else.")
     (license license:bsd-3)))
 
-(define-public python2-django-contrib-comments
-  (package-with-python2 python-django-contrib-comments))
-
 (define-public python-django-overextends
   (package
     (name "python-django-overextends")
@@ -857,9 +810,6 @@ override and extend templates from other reusable apps, in your own Django
 project.")
     (license license:bsd-2)))
 
-(define-public python2-django-overextends
-  (package-with-python2 python-django-overextends))
-
 (define-public python-django-pipeline
   (package
     (name "python-django-pipeline")
@@ -938,9 +888,6 @@ support, and optional data-URI image and font embedding.")
       "Full featured redis cache backend for Django.")
     (license license:bsd-3)))
 
-(define-public python2-django-redis
-  (package-with-python2 python-django-redis))
-
 (define-public python-django-rq
   (package
     (name "python-django-rq")
@@ -977,9 +924,6 @@ Django-RQ is a simple app that allows you to configure your queues in django's
 settings.py and easily use them in your project.")
     (license license:expat)))
 
-(define-public python2-django-rq
-  (package-with-python2 python-django-rq))
-
 (define-public python-django-q
   (package
     (name "python-django-q")
@@ -1035,9 +979,6 @@ The provided SortedManyToManyField behaves like the original one but remembers
 the order of added relations.")
     (license license:bsd-3)))
 
-(define-public python2-django-sortedm2m
-  (package-with-python2 python-django-sortedm2m))
-
 (define-public python-django-appconf
   (package
     (name "python-django-appconf")
@@ -1069,9 +1010,6 @@ django-appconf and can't easily be used as a replacement.  The similarity in
 name is purely coincidental.")
     (license license:bsd-3)))
 
-(define-public python2-django-appconf
-  (package-with-python2 python-django-appconf))
-
 (define-public python-django-statici18n
   (package
     (name "python-django-statici18n")
@@ -1108,9 +1046,6 @@ name is purely coincidental.")
 static files.")
     (license license:bsd-3)))
 
-(define-public python2-django-statici18n
-  (package-with-python2 python-django-statici18n))
-
 (define-public python-django-tagging
   (package
     (name "python-django-tagging")
@@ -1137,23 +1072,8 @@ static files.")
     (description "This package provides a generic tagging application for
 Django projects, which allows association of a number of tags with any
 @code{Model} instance and makes retrieval of tags simple.")
-    (properties `((python2-variant . ,(delay python2-django-tagging))))
     (license license:bsd-3)))
 
-(define-public python2-django-tagging
-  (let ((base (package-with-python2
-                (strip-python2-variant python-django-tagging))))
-    (package
-      (inherit base)
-      (version "0.4.6")
-      (source
-        (origin
-          (method url-fetch)
-          (uri (pypi-uri "django-tagging" version))
-          (sha256
-           (base32
-            "0s7b4v45j783yaxs7rni10k24san0ya77nqz4s7zdf3jhfpk42r1")))))))
-
 (define-public python-djangorestframework
   (package
     (name "python-djangorestframework")
-- 
2.28.0





  parent reply	other threads:[~2020-09-12 14:34 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   ` [bug#43354] [PATCH 04/55] gnu: python-pytest-django: Update to 3.9.0 Marius Bakke
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   ` Marius Bakke [this message]
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-48-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).