From 88630fdbf66e6e9d4247ac4a86be8556c98ac7a9 Mon Sep 17 00:00:00 2001 From: Kai Knoblich Date: Tue, 7 Apr 2020 10:19:40 +0000 Subject: [PATCH] www/py-django-{photologue,sortedm2m}: Update to 3.11 and 3.0.0 * Update both ports at once because www/py-django-photologue requires www/py-django-sortedm2m in version 3.0.0 or later. Also assign them to Django 2.2 (current LTS release) as Django 1.11 is End-of-Life. * www/py-django-photologue: Remove an obsolete patch that was required to fix build isses with newer versions of devel/py-pip . * www/py-django-sortedm2m: Switch to GitHub for a while as no sdist is available at PyPI. * Sort variables a bit according to the PHB. Changelogs: https://github.com/richardbarran/django-photologue/blob/3.11/CHANGELOG.txt https://github.com/jazzband/django-sortedm2m/blob/3.0.0/CHANGES.rst PR: 245359 Approved by: Kevin Golding (maintainer) --- www/py-django-photologue/Makefile | 13 ++++---- www/py-django-photologue/distinfo | 6 ++-- www/py-django-photologue/files/patch-setup.py | 31 ------------------- www/py-django-sortedm2m/Makefile | 13 ++++---- www/py-django-sortedm2m/distinfo | 6 ++-- 5 files changed, 19 insertions(+), 50 deletions(-) delete mode 100644 www/py-django-photologue/files/patch-setup.py diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index 7558565afbf4..b09d3cfe4be8 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= django-photologue -PORTVERSION= 3.8.1 -PORTREVISION= 2 +PORTVERSION= 3.11 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,14 +12,14 @@ COMMENT= Powerful image management and gallery application for Django LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=3.0.0:www/py-django-sortedm2m@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \ ${PY_PILLOW} -NO_ARCH= yes -USES= python +USES= python:3.6+ # Required as www/py-django-sortedm2m needs Python 3.6+ USE_PYTHON= autoplist distutils +NO_ARCH= yes + .include diff --git a/www/py-django-photologue/distinfo b/www/py-django-photologue/distinfo index bb2abae09dd4..a99597516a8b 100644 --- a/www/py-django-photologue/distinfo +++ b/www/py-django-photologue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521279233 -SHA256 (django-photologue-3.8.1.tar.gz) = 2a8b19e98d6cceb1fd254561821c9815d49cc449e3e89f8812da25062b1d2ea1 -SIZE (django-photologue-3.8.1.tar.gz) = 173045 +TIMESTAMP = 1585989760 +SHA256 (django-photologue-3.11.tar.gz) = 81c3caa3afc142ecab493ea30f1b35be304468893da973cc53f0f6eba60a7667 +SIZE (django-photologue-3.11.tar.gz) = 179139 diff --git a/www/py-django-photologue/files/patch-setup.py b/www/py-django-photologue/files/patch-setup.py deleted file mode 100644 index e622892faa49..000000000000 --- a/www/py-django-photologue/files/patch-setup.py +++ /dev/null @@ -1,31 +0,0 @@ ---- setup.py.orig 2019-06-24 21:32:20 UTC -+++ setup.py -@@ -2,25 +2,15 @@ - import uuid - import os - from setuptools import setup, find_packages --from pip.req import parse_requirements -+from pkg_resources import parse_requirements - - import photologue - - - def get_requirements(source): -+ with open(source) as f: -+ return sorted({str(req) for req in parse_requirements(f.read())}) - -- try: -- install_reqs = parse_requirements(source, session=uuid.uuid1()) -- except TypeError: -- # Older version of pip. -- install_reqs = parse_requirements(source) -- required = list(set([str(ir.req) for ir in install_reqs])) -- -- # Temp situation: transition from PIL to Pillow, add a hook so people can -- # skip installing Pillow. -- if os.path.exists('/tmp/PHOTOLOGUE_NO_PILLOW'): -- required = [item for item in required if not item.startswith('Pillow')] -- return required - - setup( - name="django-photologue", diff --git a/www/py-django-sortedm2m/Makefile b/www/py-django-sortedm2m/Makefile index 217f7d4fd435..6966174e2032 100644 --- a/www/py-django-sortedm2m/Makefile +++ b/www/py-django-sortedm2m/Makefile @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= django-sortedm2m -PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTVERSION= 3.0.0 CATEGORIES= www python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@caomhin.org @@ -14,10 +12,13 @@ COMMENT= Replacement for Django's many to many field #' LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} -NO_ARCH= yes -USES= python +USES= python:3.6+ +USE_GITHUB= yes +GH_ACCOUNT= jazzband USE_PYTHON= distutils autoplist +NO_ARCH= yes + .include diff --git a/www/py-django-sortedm2m/distinfo b/www/py-django-sortedm2m/distinfo index c478caccf47e..0542edc62da4 100644 --- a/www/py-django-sortedm2m/distinfo +++ b/www/py-django-sortedm2m/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520711306 -SHA256 (django-sortedm2m-1.5.0.tar.gz) = 52942b5295efcf252b6bbff58be70365d9f5d59d2e6d0f1bf9d9f2d0dbef4814 -SIZE (django-sortedm2m-1.5.0.tar.gz) = 37985 +TIMESTAMP = 1585989999 +SHA256 (jazzband-django-sortedm2m-3.0.0_GH0.tar.gz) = 0d4a93124ac40e29017187aa275b51ffe0cb150c9f717f0e931b6abd0b20a6f6 +SIZE (jazzband-django-sortedm2m-3.0.0_GH0.tar.gz) = 42890