From nobody Fri Mar 25 16:08:14 2022 X-Original-To: dev-commits-ports-all@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 1DFA21A31D43; Fri, 25 Mar 2022 16:08:15 +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 4KQ6St6y6mz3H7n; Fri, 25 Mar 2022 16:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648224495; 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=oy5G4rn0Zzvhkxiol36P0nnkudT5AGWUvfbZXZA5jw0=; b=W+xt8fkVES3ZDghd+mi1QnAAn5mc7Kyt/4WJJT8LEpTYDJryNwZ59wa1JVqYm3IXmKCH+f 0lG44nz/j8n2sj8gvISszQEWI5kiFQ49sSFTVhRhLCcttLwnhkGGaOPBSLs+hmiFa5IBUP bNNxPw7uQF6tue6zW3idmnAEOB46ae/DASe196ktB9IZJ0AHubHBS0kfIEZx7kTzJz1Ujb kP9pvoto+p+VAnVuJ/7HOj7loVMQtLik8YE6Tb12uN1d2BBqBIYLWAT9JUzaHD/T+sfy/j sythTzTdHpWd19O7ehmUHcWeFxu+Rx8a/+NX1Q+BnNJNTujhXRMETjIVGb3XBQ== 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 C05517B10; Fri, 25 Mar 2022 16:08:14 +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 22PG8ElA021920; Fri, 25 Mar 2022 16:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PG8Ejh021919; Fri, 25 Mar 2022 16:08:14 GMT (envelope-from git) Date: Fri, 25 Mar 2022 16:08:14 GMT Message-Id: <202203251608.22PG8Ejh021919@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: 49cc694155ed - main - www/py-django-hijack: Update to 3.1.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 49cc694155ed62fc2163b201a1de9d832964af05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648224495; 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=oy5G4rn0Zzvhkxiol36P0nnkudT5AGWUvfbZXZA5jw0=; b=S0UZTZsZXhhEr2QSiHzlQic+1KtFvnY+bxZNfrFlzoBHIrhz9UFZchBBFa8LSmMQmOYpBl sDNCX/3HBOdDGO9bu8VbldljCthGyk6Wfl055bjpTyoBt7vUwdtoZb8QS0CLLlzTvtTWzg g9Xcf9hh+223rROG0Yy4ND/l0/fNk9NIgsxMwqzKXO5h3fPj3iElk04WAFnMqcUGp0lfLz MU/tjRtG8FDdMY3enZi2EVKTFk4MzjPOXsts3DFvEs3yjACqWEDG2p1fh5K65vhP3VUOY2 UgoeQ5wp7IfYs0XuLoYgkwmCl81WbOxbl3iFFXIa17h4mo074CCLps+6/9aACw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648224495; a=rsa-sha256; cv=none; b=TP4MmM6Bkb8810SdCnRSGv6ExZx0JfegfNX1MuHQY5U473T1+V1sh6YbW+ONCV08DnbDd2 71EvduLSZ/+afLNW+KAF/E1Bf0WLJ6XDEAnP2RdQ7NOVNJeXd1XY40GF3M8fXXc+yc1MKv NOWPpG1N0Bfq91pKlUC8cgD2dKZfcsaUzkaacOQVp/sljuHr0lkkgeOAnpECsQHDDeHUGw VKT1AYOWFLFRZjEohB7okykp9Ep7z6T74WKohJb8zgqLXhQh5Dj0+ylEmYNBiNtBKakSLM SdsgHIY18EjfjJD39DM6GuLYTfakFOnLdGyGfaepcBenC6Tw+lTbr+ji0tJlDA== 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=49cc694155ed62fc2163b201a1de9d832964af05 commit 49cc694155ed62fc2163b201a1de9d832964af05 Author: Kai Knoblich AuthorDate: 2022-03-25 16:00:04 +0000 Commit: Kai Knoblich CommitDate: 2022-03-25 16:07:58 +0000 www/py-django-hijack: Update to 3.1.4 Changelog since 2.1.10: https://github.com/django-hijack/django-hijack/compare/v2.1.10...3.1.4 PR: 262678 Approved by: Kevin Golding (maintainer) --- www/py-django-hijack/Makefile | 44 ++++++++++++++++++++++++++----- www/py-django-hijack/distinfo | 8 +++--- www/py-django-hijack/files/patch-setup.py | 35 ++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 9 deletions(-) diff --git a/www/py-django-hijack/Makefile b/www/py-django-hijack/Makefile index 5ae7530492fe..48d6d9a293e9 100644 --- a/www/py-django-hijack/Makefile +++ b/www/py-django-hijack/Makefile @@ -1,11 +1,13 @@ # Created by: Kevin Golding PORTNAME= django-hijack -PORTVERSION= 2.1.10 -PORTREVISION= 1 +PORTVERSION= 3.1.4 CATEGORIES= www python -MASTER_SITES= CHEESESHOP +MASTER_SITES= CHEESESHOP \ + https://ports.caomhin.org/:npmcache PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npmcache MAINTAINER= ports@caomhin.org COMMENT= Allows Django superusers to login as other users @@ -13,12 +15,42 @@ COMMENT= Allows Django superusers to login as other users LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-compat>=1.0.14:www/py-django-compat@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ + npm:www/npm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2:www/py-django22@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-django>0:devel/py-pytest-django@${PY_FLAVOR} -USES= python:3.5+ +USES= gettext-tools:build python:3.6+ USE_PYTHON= distutils autoplist +MAKE_ENV= npm_config_offline=true +TEST_ENV= DJANGO_SETTINGS_MODULES=hijack.tests.test_app.settings PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + NO_ARCH= yes +_MY_NPMCACHE= ${WRKDIR}/.npm + +# Add remaining files (e.g. *.po) that aren't recorded by setuptools +# during install. +post-install: + @${FIND} ${STAGEDIR} -type f -o -type l | \ + ${SORT} | ${SED} -e 's|${STAGEDIR}||' \ + > ${WRKDIR}/.PLIST.pymodtmp + +do-test: + @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts= + +# Helper target to make the generation of the npm cache easier +make-npm-cache: extract + @${RM} -r ${_MY_NPMCACHE} + @cd ${WRKSRC}/ \ + && ${SETENV} HOME=${WRKDIR} ${LOCALBASE}/bin/npm ci + @cd ${_MY_NPMCACHE} \ + && ${RM} _locks anonymous-cli-metrics.json + @cd ${WRKDIR} \ + && ${TAR} -czf ${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX} .npm \ + && ${ECHO_CMD} "Please upload the file ${WRKDIR}/${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}" + .include diff --git a/www/py-django-hijack/distinfo b/www/py-django-hijack/distinfo index b84e250500cf..a5fca74d58e9 100644 --- a/www/py-django-hijack/distinfo +++ b/www/py-django-hijack/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1549044642 -SHA256 (django-hijack-2.1.10.tar.gz) = be484f0ca67a092d5bf9bf8a5307beb716dc2e86b56a69796479183fdeb9036c -SIZE (django-hijack-2.1.10.tar.gz) = 20480 +TIMESTAMP = 1647700803 +SHA256 (django-hijack-3.1.4.tar.gz) = 785940c2e693401d8302fff4ced2d8cf0beb69a88b7f944539b035ab11b1b6d3 +SIZE (django-hijack-3.1.4.tar.gz) = 213799 +SHA256 (django-hijack-npm-cache-3.1.4.tar.gz) = 54252454e9ba0f93d101494392814027f29792344a9d06cc188f970b5e0e49c5 +SIZE (django-hijack-npm-cache-3.1.4.tar.gz) = 13227839 diff --git a/www/py-django-hijack/files/patch-setup.py b/www/py-django-hijack/files/patch-setup.py new file mode 100644 index 000000000000..7527154ec8ba --- /dev/null +++ b/www/py-django-hijack/files/patch-setup.py @@ -0,0 +1,35 @@ +Handle the installation by native setuptools to prevent errors like +"command 'install' has no such option 'single_version_externally_managed'". + +--- setup.py.orig 2022-03-12 16:51:11 UTC ++++ setup.py +@@ -5,7 +5,6 @@ import os + import subprocess # nosec + from distutils.cmd import Command + from distutils.command.build import build as _build +-from distutils.command.install import install as _install + + from setuptools import setup + +@@ -62,21 +61,11 @@ class build(_build): + ("compile_scss", None), + ] + +- +-class install(_install): +- sub_commands = [ +- *_install.sub_commands, +- ("compile_translations", None), +- ("compile_scss", None), +- ] +- +- + setup( + name="django-hijack", + use_scm_version=True, + cmdclass={ + "build": build, +- "install": install, + "compile_translations": compile_translations, + "compile_scss": compile_scss, + },