From nobody Thu Jun 30 07:20:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A6A0887C490; Thu, 30 Jun 2022 07:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LYV8h1t09z3R35; Thu, 30 Jun 2022 07:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656573604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ytvWwZJ9erSSRfsGL/tEfN2MZ3HQlJmLDX3KgoCEiHA=; b=UMVgfIoiXaUBlPjz2Mo6C4JAkhBWN0J4xaXNQNoalW0jFhZsiYJsQl85cVIauy7Ibu2Na5 t5sdnD0Rr6X14VaRLudyne2jmuTseYNs9JfDAiP/rA52MYbmaZB8taRJj/RUVLrEK+KjRo v4ALugHyeA1raPqWInl+heZCGY+NIFmCQLMsvzJ4HWB2U3DaxfEPVZ6R8/0Xz4s5kmhhk9 dohIanXheCJsDbfjDsjrF5cCD2FCDgIGA8KY3Oz3CM+h3Ls9NeAMcD+IqOOWinNKgG2BN2 rNsuc9MH8uBiOsX7yR7Bf9hWVnm3W6fM6JfFC5mya2M++Yo/uJuEvjc+G5c9lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09DB821E3C; Thu, 30 Jun 2022 07:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25U7K3lU086747; Thu, 30 Jun 2022 07:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25U7K3Gh086744; Thu, 30 Jun 2022 07:20:03 GMT (envelope-from git) Date: Thu, 30 Jun 2022 07:20:03 GMT Message-Id: <202206300720.25U7K3Gh086744@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 80b4f695a700 - main - www/py-django-tagging: Add Django 3.2 compatibility List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80b4f695a700f521a0c0415009a1536cd5987123 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656573604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ytvWwZJ9erSSRfsGL/tEfN2MZ3HQlJmLDX3KgoCEiHA=; b=AWTKb5tsBev7eoPqEmbwvdhgIrTDX6zWXy8u+5QTokKJC8lOsKPdhODC5S7yIn8Tb9kdqg fATio+857ZzXh0Po5A5rin2XLl3vW/Sj0PLXbnQ6bv8KpomGcmKZH/PZCz/Rg94nard1Zc w+KCCBRqzoTAffYnGegRbbHvkjxu2wKV9jsY+IrF+IsZgng3ZTbR7Yiv2dDPPE2dXzKcUE 7zlNaaY0Rf81omy3XiZMlZtJhTfslL+2P1Sx2PyKa2HSu7r1CdmcQhhj232yu5fN3HyE8R 5pM+ccInAXBAZOcRxEX3chICwXELtT9qPbz4Jk8llvip1CKK+0VU6O73o8lvuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656573604; a=rsa-sha256; cv=none; b=PN6nECwmhBDkzJdYW9R0ilVCHBRD3ueIghbthCnehdsPOwYkqnYOUUq5zZ8J6Bz/NzeCgb dhqRkP1fBNGIgWD1emN7XKCgI0fQX/GWsC/OY3XGR1jhRbsxxSBaRUVBVsrwoUfZQHp9Ru HsmfhD/T+av3f7JIAoaeVMd5soJbhk/InwWveVfcXzRyC0seSee3Rx3gEty0ujPipoj1Kp 3sEm0iyJaMhQ6wKwSqact79sOM0Bw22Ob/ncsA/LV3nwEvZBxBU1MOGaSLxqVx3UoR6kH9 8+cUfWoBivEqTYGlzUn0uuvafpBZc9fpw3ztMr5Fp46mG812RX3rrhIKYd1w2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=80b4f695a700f521a0c0415009a1536cd5987123 commit 80b4f695a700f521a0c0415009a1536cd5987123 Author: Kevin Golding AuthorDate: 2022-06-30 07:04:53 +0000 Commit: Kai Knoblich CommitDate: 2022-06-30 07:19:28 +0000 www/py-django-tagging: Add Django 3.2 compatibility * Add a patch to incorporate an upstream pull-request [1] to address the Django 2.2 deprecation [2] and set dependency to Django 3.2. PR: 263216, 261313 [2] Obtained from: [1] https://github.com/Fantomas42/django-tagging/pull/23/ --- www/py-django-tagging/Makefile | 3 ++- .../files/patch-tagging_models.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile index db38462200b1..fe2b06a7c88a 100644 --- a/www/py-django-tagging/Makefile +++ b/www/py-django-tagging/Makefile @@ -2,6 +2,7 @@ PORTNAME= django-tagging PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +14,7 @@ LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django32>=0:www/py-django32@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= distutils autoplist diff --git a/www/py-django-tagging/files/patch-tagging_models.py b/www/py-django-tagging/files/patch-tagging_models.py new file mode 100644 index 000000000000..5c4c00ac7116 --- /dev/null +++ b/www/py-django-tagging/files/patch-tagging_models.py @@ -0,0 +1,22 @@ +--- tagging/models.py.orig 2022-04-11 10:40:39 UTC ++++ tagging/models.py +@@ -5,6 +5,7 @@ from django.contrib.contenttypes.fields import Generic + 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_text + from django.utils.translation import gettext_lazy as _ + +@@ -155,8 +156,9 @@ class TagManager(models.Manager): + 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