From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YJFHCGXcXF8gWgAA0tVLHw (envelope-from ) for ; Sat, 12 Sep 2020 14:34:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id uLCUAmXcXF/gQgAAB5/wlQ (envelope-from ) for ; Sat, 12 Sep 2020 14:34:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 51BAB940876 for ; Sat, 12 Sep 2020 14:34:12 +0000 (UTC) Received: from localhost ([::1]:32844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH6bT-0000tn-7Y for larch@yhetil.org; Sat, 12 Sep 2020 10:34:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kH6bL-0000t6-4f for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kH6bK-00069C-Qo for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kH6bK-0004DB-OQ for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43354] [PATCH 48/55] gnu: Remove python2 versions of Django packages. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Sep 2020 14:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43354 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43354@debbugs.gnu.org Received: via spool by 43354-submit@debbugs.gnu.org id=B43354.159992120016024 (code B ref 43354); Sat, 12 Sep 2020 14:34:02 +0000 Received: (at 43354) by debbugs.gnu.org; 12 Sep 2020 14:33:20 +0000 Received: from localhost ([127.0.0.1]:48765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH6ae-0004AO-8O for submit@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH6ac-0004A2-9v for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:18 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36451) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH6aX-0005td-0s for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:13 -0400 Received: from ti0006q161-3115.bb.online.no ([88.95.106.80]:53710 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kH6aT-0008BZ-49 for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:10 -0400 From: Marius Bakke Date: Sat, 12 Sep 2020 16:29:04 +0200 Message-Id: <20200912142911.6231-48-marius@gnu.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200912142911.6231-1-marius@gnu.org> References: <20200912142911.6231-1-marius@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: i6nNopoB6kIz 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