diff --git a/www/py-django-hijack/Makefile b/www/py-django-hijack/Makefile index 32a960496793..fc65bd174b52 100644 --- a/www/py-django-hijack/Makefile +++ b/www/py-django-hijack/Makefile @@ -1,55 +1,55 @@ PORTNAME= django-hijack -PORTVERSION= 3.2.1 +PORTVERSION= 3.4.1 CATEGORIES= www python MASTER_SITES= PYPI \ 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 WWW= https://github.com/arteria/django-hijack LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE 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}django32>=2.2:www/py-django32@${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= gettext-tools:build python:3.6+ +USES= gettext-tools:build python:3.7+ 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 19e7c0c9e9dc..6d78c59a7e00 100644 --- a/www/py-django-hijack/distinfo +++ b/www/py-django-hijack/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1662475103 -SHA256 (django-hijack-3.2.1.tar.gz) = 8df524fd085a43205a6bb497c53fd94483824b4f3179762fc1c31c1dea58d1ca -SIZE (django-hijack-3.2.1.tar.gz) = 267537 -SHA256 (django-hijack-npm-cache-3.2.1.tar.gz) = d4ddca269de2823ec2abd06e614bd48111d7297b644ecc64e976017b840cd53a -SIZE (django-hijack-npm-cache-3.2.1.tar.gz) = 9937612 +TIMESTAMP = 1685006866 +SHA256 (django-hijack-3.4.1.tar.gz) = 2bdd7ffa42198637f49c195468b8330ea51dc36b7c2bee0f3c220c9d7de78764 +SIZE (django-hijack-3.4.1.tar.gz) = 268223 +SHA256 (django-hijack-npm-cache-3.4.1.tar.gz) = 7042d3db3cefd7acd82ad1163826eb25da805c568cd40418db5d078376e33828 +SIZE (django-hijack-npm-cache-3.4.1.tar.gz) = 10792160 diff --git a/www/py-django-hijack/files/patch-setup.py b/www/py-django-hijack/files/patch-setup.py index 7527154ec8ba..e4629e63225e 100644 --- a/www/py-django-hijack/files/patch-setup.py +++ b/www/py-django-hijack/files/patch-setup.py @@ -1,35 +1,36 @@ -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.orig 2023-05-23 13:27:00 UTC +++ setup.py -@@ -5,7 +5,6 @@ import os +@@ -5,10 +5,9 @@ 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 pathlib import Path - from setuptools import setup +-from setuptools import setup ++from setuptools import setup, find_packages -@@ -62,21 +61,11 @@ class build(_build): - ("compile_scss", None), + BASE_DIR = os.path.dirname((os.path.abspath(__file__))) + +@@ -71,20 +70,12 @@ class build(_build): ] -- + -class install(_install): - sub_commands = [ - *_install.sub_commands, - ("compile_translations", None), - ("compile_scss", None), - ] - - setup( name="django-hijack", use_scm_version=True, ++ packages=find_packages(exclude=['test_app']), cmdclass={ "build": build, - "install": install, "compile_translations": compile_translations, "compile_scss": compile_scss, },