From nobody Sun Mar 24 17:59:54 2024 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 4V2kNq0Hxgz5G8Y3; Sun, 24 Mar 2024 17:59:55 +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 4V2kNp6y0lz4Rv8; Sun, 24 Mar 2024 17:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711303195; 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=EoSOFSzKX95hyd7bYAxXJSzoJebkJ9IVtKIuTdwoLUU=; b=MK/uikDOUbqeyFTLrRRoKakblHX5lnvOfkMLNxmMMorYyoXvu3ZWiArXeE3jlSWrvpfbcx YK69RaM+Ekchiq+2skAlSWhMva/VaKUlkhGNm0fR3LmY3gHt/prEA5e7dTs6Mq0AKiZkHB SYnfFX1Le3CAZxt/Npza5RIca31OeVpxcNnCEqyVOzDJdTsJM8W2FOxIuWB+1izkVeROlI 0DLYy7R83Xm2HlWwu1+AFFlsoT5JEsMcig6wvx4WgdOxLgH6vUd+courFjJtQUQjucuO7F UhzuSnEIZuu06fOXSCVdhJA+WbD9TTdisEhHt0EkxabAATkK/o/VkCNfrX8DhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711303195; a=rsa-sha256; cv=none; b=rGsrl0AGeJtp9hD7lxiR3wKP3/AdOFQ4j0w7BHb9z/YoLuCsbCzx5QiRRSBWZ9MptpweYz lGQ15sU/pCRofV4CRC1BvrRqolvVTrW7K5CU+OmzH+/cY74KAdt3Qk8cnvXNzvFYUWkJYO A4V1YUgSefd9uB6cPwHR3O+fYY8jELZy9NZICUTj2bbii7+b9kwE0sSyjZeLVCaVi5beIv GKRkLXbs/Q9jQZxjVD9Rfhwr71miC5HbtiqhL0sLa2dLykCFwZtHTnz7eHkQxOHnP7JPsQ /dqGmuJ1cl+1C4DziND/dEwKO0FhUIG9vxYMfp2LjXerkRZXmUfEuQBkkYQtSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711303195; 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=EoSOFSzKX95hyd7bYAxXJSzoJebkJ9IVtKIuTdwoLUU=; b=XJfm1mEm44S4aJaNXaIwD4UD1CG3y9CN0e+Z2VdM0EMUFXmTx2knSQD30ABKZ+yJKM7nxj iTVsdbcdUk/COc1fkyBCugCtC583fQ5qEf2D+xuurIROLvNdaKA+1olvqi/eAmj+OO84y/ p+mUgxIknCynUdYp47lP0evkakgz0MiCVMlqfNyL3lFFTFW3yDozXUjq8HVt3N1HLaA3mL tImSxTrKKX6NLjetzSnTIIOjTlKNp4XgWar5nY/oUk+zomDyg/C6ROipWE36moJZHX7Hu5 rXUbkcsxKuG2Du3+8q7q/3Ij/T5je0yfneb6QDUHgjD14C4Us9rTtJpuMaylxA== 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 4V2kNp6Y5czjZp; Sun, 24 Mar 2024 17:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42OHxssn048344; Sun, 24 Mar 2024 17:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OHxsck048341; Sun, 24 Mar 2024 17:59:54 GMT (envelope-from git) Date: Sun, 24 Mar 2024 17:59:54 GMT Message-Id: <202403241759.42OHxsck048341@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: 164c5e98aa9b - main - www/py-django-assets: Add compatibility for Django 4.x 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: 164c5e98aa9b406b2297ddcd76d5c0004e9b0dd0 Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=164c5e98aa9b406b2297ddcd76d5c0004e9b0dd0 commit 164c5e98aa9b406b2297ddcd76d5c0004e9b0dd0 Author: Kai Knoblich AuthorDate: 2024-03-24 17:54:42 +0000 Commit: Kai Knoblich CommitDate: 2024-03-24 17:54:42 +0000 www/py-django-assets: Add compatibility for Django 4.x * Add an upstream patch that adds compatibility for Python 3.11 as well while I'm here. PR: 276319 --- www/py-django-assets/Makefile | 5 +++-- .../files/patch-django__assets_glob.py | 20 ++++++++++++++++++++ ...atch-django__assets_management_commands_assets.py | 19 +++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/www/py-django-assets/Makefile b/www/py-django-assets/Makefile index eaf5dbb328f5..e4d97b91c5c4 100644 --- a/www/py-django-assets/Makefile +++ b/www/py-django-assets/Makefile @@ -1,6 +1,6 @@ PORTNAME= django-assets PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,8 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django32>=1.7:www/py-django32@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webassets>=2.0:www/py-webassets@${PY_FLAVOR} -USES= python +USES= dos2unix python +DOS2UNIX_FILES= django_assets/management/commands/assets.py USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/www/py-django-assets/files/patch-django__assets_glob.py b/www/py-django-assets/files/patch-django__assets_glob.py new file mode 100644 index 000000000000..477b48ae19fb --- /dev/null +++ b/www/py-django-assets/files/patch-django__assets_glob.py @@ -0,0 +1,20 @@ +From: Jonatan Heyman +Date: Thu, 10 Nov 2022 23:26:07 +0100 +Subject: [PATCH] Global regex flags must be at the start of regex in Python + 3.11 + +Obtained from: + +https://patch-diff.githubusercontent.com/raw/miracle2k/django-assets/pull/104.patch + +--- django_assets/glob.py.orig 2018-02-23 09:54:00 UTC ++++ django_assets/glob.py +@@ -121,7 +121,7 @@ def translate(pat): + res = '%s([%s])' % (res, stuff) + else: + res = res + re.escape(c) +- return res + '\Z(?ms)' ++ return '(?ms)' + res + '\Z' + + + """Filename globbing utility.""" diff --git a/www/py-django-assets/files/patch-django__assets_management_commands_assets.py b/www/py-django-assets/files/patch-django__assets_management_commands_assets.py new file mode 100644 index 000000000000..bb4840e09621 --- /dev/null +++ b/www/py-django-assets/files/patch-django__assets_management_commands_assets.py @@ -0,0 +1,19 @@ +From: Madison Swain-Bowden +Date: Sat, 5 Nov 2022 14:08:05 -0700 +Subject: [PATCH] Fix issue with running in Django 4.1 + +Obtained from: + +https://patch-diff.githubusercontent.com/raw/miracle2k/django-assets/pull/103.patch + +--- django_assets/management/commands/assets.py.orig 2024-03-24 15:11:16 UTC ++++ django_assets/management/commands/assets.py +@@ -37,7 +37,7 @@ class Command(BaseCommand): + + class Command(BaseCommand): + help = 'Manage assets.' +- requires_system_checks = False ++ requires_system_checks = [] + + def add_arguments(self, parser): + # parser.add_argument('poll_id', nargs='+', type=str)